bios_emulator: Drop VIDEO_IO_OFFSET

This is always zero in the source tree, so drop it.

While we are here, add a comment to _X86EMU_env since the symbol is
actually defined twice, which can cause confusion when building.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/drivers/bios_emulator/biosemui.h b/drivers/bios_emulator/biosemui.h
index 7853015c1e2ef83b57b207299cdc603312e15ece..954cd883158cf89cb4270f17ee85094ddf989bee 100644 (file)
--- a/drivers/bios_emulator/biosemui.h
+++ b/drivers/bios_emulator/biosemui.h
@@ -128,19 +128,19 @@ typedef struct {
        u32 finalVal;
 } BE_portInfo;
 
-#define PM_inpb(port)  inb(port+VIDEO_IO_OFFSET)
-#define PM_inpw(port)  inw(port+VIDEO_IO_OFFSET)
-#define PM_inpd(port)  inl(port+VIDEO_IO_OFFSET)
-#define PM_outpb(port,val)     outb(val,port+VIDEO_IO_OFFSET)
-#define PM_outpw(port,val)     outw(val,port+VIDEO_IO_OFFSET)
-#define PM_outpd(port,val)     outl(val,port+VIDEO_IO_OFFSET)
+#define PM_inpb(port)  inb(port)
+#define PM_inpw(port)  inw(port)
+#define PM_inpd(port)  inl(port)
+#define PM_outpb(port, val)    outb(val, port)
+#define PM_outpw(port, val)    outw(val, port)
+#define PM_outpd(port, val)    outl(val, port)
 
 #define LOG_inpb(port) PM_inpb(port)
 #define LOG_inpw(port) PM_inpw(port)
 #define LOG_inpd(port) PM_inpd(port)
-#define LOG_outpb(port,val)    PM_outpb(port,val)
-#define LOG_outpw(port,val)    PM_outpw(port,val)
-#define LOG_outpd(port,val)    PM_outpd(port,val)
+#define LOG_outpb(port, val)   PM_outpb(port, val)
+#define LOG_outpw(port, val)   PM_outpw(port, val)
+#define LOG_outpd(port, val)   PM_outpd(port, val)
 
 /*-------------------------- Function Prototypes --------------------------*/
 

diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index c2db1213fe66262145e6f790a75aef2012c6ceac..882a8a34cc3e43c08f3bb6608094c4fe4ed713cc 100644 (file)
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -44,6 +44,7 @@
 
 /*------------------------- Global Variables ------------------------------*/
 
+/* Note: bios.c defines this if the emulator is not enabled */
 X86EMU_sysEnv _X86EMU_env;     /* Global emulator machine state */
 X86EMU_intrFuncs _X86EMU_intrTab[256];
 

diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h
index 60617e6fec25a5c3575fcd48ee2358de9f128da7..03c364f29fb30a7078d27f73914f5b12301af9e7 100644 (file)
--- a/include/configs/conga-qeval20-qa3-e3845.h
+++ b/include/configs/conga-qeval20-qa3-e3845.h
@@ -16,8 +16,6 @@
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 
-#define VIDEO_IO_OFFSET                                0
-
 #undef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS                         \
        "kernel-ver=4.4.0-22\0"                                 \

diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h
index 05389a435bee67a810ee5dc2cfc3a44c523142e7..be095e28a1b43d0b883d3e85503814ed6122078a 100644 (file)
--- a/include/configs/dfi-bt700.h
+++ b/include/configs/dfi-bt700.h
@@ -20,8 +20,6 @@
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 
-#define VIDEO_IO_OFFSET                                0
-
 #undef CFG_EXTRA_ENV_SETTINGS
 #define CFG_EXTRA_ENV_SETTINGS                         \
        "kernel-ver=4.4.0-24\0"                                 \

diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index 4a12c2f72c62cc3a2b53efab276a8a9087fe2406..842672d55751bad1de89e3521efee50d4573fd76 100644 (file)
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -17,6 +17,4 @@
                                        "stderr=vidconsole,serial\0" \
                                        "usb_pgood_delay=40\0"
 
-#define VIDEO_IO_OFFSET                                0
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h
index b2e7aa1514c0de9c2ea13b36f33abe8ac194b735..5f7eabd3fc6421f5c18f5cf768d9ca7373eaef11 100644 (file)
--- a/include/configs/som-db5800-som-6867.h
+++ b/include/configs/som-db5800-som-6867.h
@@ -16,6 +16,4 @@
                                        "stdout=serial,vidconsole\0" \
                                        "stderr=serial,vidconsole\0"
 
-#define VIDEO_IO_OFFSET                                0
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/theadorable-x86-common.h b/include/configs/theadorable-x86-common.h
index b23b8783076b1130b34f1def5d83abe85a056e3c..46aef238213a95ae605084204e23fd3e3951a9c2 100644 (file)
--- a/include/configs/theadorable-x86-common.h
+++ b/include/configs/theadorable-x86-common.h
@@ -15,8 +15,6 @@
                                        "stdout=serial\0" \
                                        "stderr=serial\0"
 
-#define VIDEO_IO_OFFSET                                0
-
 /* Environment settings */
 
 #undef CFG_EXTRA_ENV_SETTINGS

diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 98abb00927ad5ba4eecfd080509023fb6b5b8889..6bf90c7de4325c056af962438ca0e5cdda7e5004 100644 (file)
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -10,8 +10,6 @@
 #define CFG_X86_REFCODE_ADDR                   0xffea0000
 #define CFG_X86_REFCODE_RUN_ADDR               0
 
-#define VIDEO_IO_OFFSET                                0
-
 #define CFG_STD_DEVICES_SETTINGS       "stdin=usbkbd,i8042-kbd,serial\0" \
                                        "stdout=vidconsole,serial\0" \
                                        "stderr=vidconsole,serial\0"