x86: Unify arch/io.h and arch/romcc_io.h
Here's the great news: From now on you don't have to worry about hitting the right io.h include anymore. Just forget about romcc_io.h and use io.h instead. This cleanup has a number of advantages, like you don't have to guard device/ includes for SMM and pre RAM anymore. This allows to get rid of a number of ifdefs and will generally make the code more readable and understandable. Potentially in the future some of the code in the io.h __PRE_RAM__ path should move to device.h or other device/ includes instead, but that's another incremental change. Change-Id: I356f06110e2e355e9a5b4b08c132591f36fec7d9 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2872 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
committed by
Stefan Reinauer
parent
55ed310655
commit
24d1d4b472
@@ -17,9 +17,11 @@
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <reset.h> /* hard_reset, soft_rest*/
|
||||
#include <arch/io.h> /* inb, outb */
|
||||
#include <arch/romcc_io.h> /* pci_read_config32, device_t, PCI_DEV */
|
||||
#ifndef __PRE_RAM__
|
||||
#define __PRE_RAM__ // Use simple device model for this file even in ramstage
|
||||
#endif
|
||||
#include <arch/io.h>
|
||||
#include <reset.h>
|
||||
|
||||
#define HT_INIT_CONTROL 0x6C
|
||||
#define HTIC_BIOSR_Detect (1<<5)
|
||||
|
Reference in New Issue
Block a user