Signed-off-by: Tom Rini <tr...@konsulko.com>
---
drivers/bios_emulator/besys.c | 18 +++++++++---------
include/configs/conga-qeval20-qa3-e3845.h | 2 +-
include/configs/dfi-bt700.h | 2 +-
include/configs/minnowmax.h | 2 +-
include/configs/som-db5800-som-6867.h | 2 +-
include/configs/theadorable-x86-common.h | 2 +-
include/configs/x86-chromebook.h | 2 +-
scripts/config_whitelist.txt | 2 --
8 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 02c4286a854c..28c41e70a226 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -54,7 +54,7 @@
/*------------------------- Global Variables ------------------------------*/
-#ifndef CONFIG_X86EMU_RAW_IO
+#ifndef CFG_X86EMU_RAW_IO
static char *BE_biosDate = "08/14/99";
static u8 BE_model = 0xFC;
static u8 BE_submodel = 0x00;
@@ -94,7 +94,7 @@ static u8 *BE_memaddr(u32 addr)
} else if (addr >= 0xA0000 && addr <= 0xBFFFF) {
return (u8*)(_BE_env.busmem_base + addr - 0xA0000);
}
-#ifdef CONFIG_X86EMU_RAW_IO
+#ifdef CFG_X86EMU_RAW_IO
else if (addr >= 0xD0000 && addr <= 0xFFFFF) {
/* We map the real System BIOS directly on real PC's */
DB(printf("BE_memaddr: System BIOS address %#lx\n",
@@ -240,7 +240,7 @@ void X86API BE_wrl(u32 addr, u32 val)
}
}
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
/* For Non-Intel machines we may need to emulate some I/O port accesses that
* the BIOS may try to access, such as the PCI config registers.
@@ -571,7 +571,7 @@ u8 X86API BE_inb(X86EMU_pioAddr port)
{
u8 val = 0;
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
if (IS_VGA_PORT(port)){
/*seems reading port 0x3c3 return the high 16 bit of io port*/
if(port == 0x3c3)
@@ -617,7 +617,7 @@ u16 X86API BE_inw(X86EMU_pioAddr port)
{
u16 val = 0;
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
if (IS_PCI_PORT(port))
val = PCI_inp(port, REG_READ_WORD);
else if (port < 0x100) {
@@ -650,7 +650,7 @@ u32 X86API BE_inl(X86EMU_pioAddr port)
{
u32 val = 0;
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
if (IS_PCI_PORT(port))
val = PCI_inp(port, REG_READ_DWORD);
else if (port < 0x100) {
@@ -678,7 +678,7 @@ through to the real hardware if we don't need to special
case it.
****************************************************************************/
void X86API BE_outb(X86EMU_pioAddr port, u8 val)
{
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
if (IS_VGA_PORT(port))
VGA_outpb(port, val);
else if (IS_TIMER_PORT(port))
@@ -713,7 +713,7 @@ through to the real hardware if we don't need to special
case it.
****************************************************************************/
void X86API BE_outw(X86EMU_pioAddr port, u16 val)
{
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
if (IS_VGA_PORT(port)) {
VGA_outpb(port, val);
VGA_outpb(port + 1, val >> 8);
@@ -744,7 +744,7 @@ through to the real hardware if we don't need to special
case it.
****************************************************************************/
void X86API BE_outl(X86EMU_pioAddr port, u32 val)
{
-#if !defined(CONFIG_X86EMU_RAW_IO)
+#if !defined(CFG_X86EMU_RAW_IO)
if (IS_PCI_PORT(port)) {
PCI_outp(port, val, REG_WRITE_DWORD);
} else if (port < 0x100) {
diff --git a/include/configs/conga-qeval20-qa3-e3845.h
b/include/configs/conga-qeval20-qa3-e3845.h
index 1066da3f8326..5cc6e06ddc2d 100644
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -17,7 +17,7 @@
"stderr=serial\0"
#define VIDEO_IO_OFFSET 0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
#undef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 36c2510628fc..0ffc0c7d4f0b 100644
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -21,7 +21,7 @@
"stderr=serial\0"
#define VIDEO_IO_OFFSET 0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
#undef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index f3f645f9d699..e31c6b54652a 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -18,6 +18,6 @@
"usb_pgood_delay=40\0"
#define VIDEO_IO_OFFSET 0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
#endif /* __CONFIG_H */
diff --git a/include/configs/som-db5800-som-6867.h
b/include/configs/som-db5800-som-6867.h
index 14cacbfe3f13..33f2e0ffbb5b 100644
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -17,6 +17,6 @@
"stderr=serial,vidconsole\0"
#define VIDEO_IO_OFFSET 0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
#endif /* __CONFIG_H */
diff --git a/include/configs/theadorable-x86-common.h
b/include/configs/theadorable-x86-common.h
index 6b65fad50692..b58c14205115 100644
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -16,7 +16,7 @@
"stderr=serial\0"
#define VIDEO_IO_OFFSET 0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
/* Environment settings */
diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index dfacecbdd501..ccd37abe2611 100644
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -11,7 +11,7 @@
#define CONFIG_X86_REFCODE_RUN_ADDR 0
#define VIDEO_IO_OFFSET 0
-#define CONFIG_X86EMU_RAW_IO
+#define CFG_X86EMU_RAW_IO
#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \
"stdout=vidconsole,serial\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index c0bfa41ab9d8..e9ca514f3cdb 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -252,8 +252,6 @@ CFG_VSC7385_IMAGE
CFG_VSC7385_IMAGE_SIZE
CFG_WATCHDOG_PRESC
CFG_WATCHDOG_RC
-CONFIG_WATCHDOG_TIMEOUT
-CONFIG_X86EMU_RAW_IO
CONFIG_X86_MRC_ADDR
CONFIG_X86_REFCODE_ADDR
CONFIG_X86_REFCODE_RUN_ADDR
--
2.25.1
