Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-01 08:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bios_emulator: Drop VIDEO_IO_OFFSET

Browse source 
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>
This commit is contained in:
Simon Glass 2023-07-15 21:38:39 -06:00 • committed by Bin Meng
parent 603363927a
commit 70f2030f02
8 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/bios_emulator/biosemui.h
View file

@ -128,12 +128,12 @@ typedef struct {
u32 finalVal; u32 finalVal;
} BE_portInfo; } BE_portInfo;
#define PM_inpb(port) inb(port+VIDEO_IO_OFFSET) #define PM_inpb(port) inb(port)
#define PM_inpw(port) inw(port+VIDEO_IO_OFFSET) #define PM_inpw(port) inw(port)
#define PM_inpd(port) inl(port+VIDEO_IO_OFFSET) #define PM_inpd(port) inl(port)
#define PM_outpb(port,val) outb(val,port+VIDEO_IO_OFFSET) #define PM_outpb(port, val) outb(val, port)
#define PM_outpw(port,val) outw(val,port+VIDEO_IO_OFFSET) #define PM_outpw(port, val) outw(val, port)
#define PM_outpd(port,val) outl(val,port+VIDEO_IO_OFFSET) #define PM_outpd(port, val) outl(val, port)
#define LOG_inpb(port) PM_inpb(port) #define LOG_inpb(port) PM_inpb(port)
#define LOG_inpw(port) PM_inpw(port) #define LOG_inpw(port) PM_inpw(port)

1
drivers/bios_emulator/x86emu/sys.c
View file

@ -44,6 +44,7 @@
/*------------------------- Global Variables ------------------------------*/ /*------------------------- Global Variables ------------------------------*/
/* Note: bios.c defines this if the emulator is not enabled */
X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */ X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */
X86EMU_intrFuncs _X86EMU_intrTab[256]; X86EMU_intrFuncs _X86EMU_intrTab[256];

2
include/configs/conga-qeval20-qa3-e3845.h
View file

@ -16,8 +16,6 @@
"stdout=serial\0" \ "stdout=serial\0" \
"stderr=serial\0" "stderr=serial\0"
#define VIDEO_IO_OFFSET 0
#undef CFG_EXTRA_ENV_SETTINGS #undef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS \ #define CFG_EXTRA_ENV_SETTINGS \
"kernel-ver=4.4.0-22\0" \ "kernel-ver=4.4.0-22\0" \

2
include/configs/dfi-bt700.h
View file

@ -20,8 +20,6 @@
"stdout=serial\0" \ "stdout=serial\0" \
"stderr=serial\0" "stderr=serial\0"
#define VIDEO_IO_OFFSET 0
#undef CFG_EXTRA_ENV_SETTINGS #undef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS \ #define CFG_EXTRA_ENV_SETTINGS \
"kernel-ver=4.4.0-24\0" \ "kernel-ver=4.4.0-24\0" \

2
include/configs/minnowmax.h
View file

@ -17,6 +17,4 @@
"stderr=vidconsole,serial\0" \ "stderr=vidconsole,serial\0" \
"usb_pgood_delay=40\0" "usb_pgood_delay=40\0"
#define VIDEO_IO_OFFSET 0
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

2
include/configs/som-db5800-som-6867.h
View file

@ -16,6 +16,4 @@
"stdout=serial,vidconsole\0" \ "stdout=serial,vidconsole\0" \
"stderr=serial,vidconsole\0" "stderr=serial,vidconsole\0"
#define VIDEO_IO_OFFSET 0
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

2
include/configs/theadorable-x86-common.h
View file

@ -15,8 +15,6 @@
"stdout=serial\0" \ "stdout=serial\0" \
"stderr=serial\0" "stderr=serial\0"
#define VIDEO_IO_OFFSET 0
/* Environment settings */ /* Environment settings */
#undef CFG_EXTRA_ENV_SETTINGS #undef CFG_EXTRA_ENV_SETTINGS

2
include/configs/x86-chromebook.h
View file

@ -10,8 +10,6 @@
#define CFG_X86_REFCODE_ADDR 0xffea0000 #define CFG_X86_REFCODE_ADDR 0xffea0000
#define CFG_X86_REFCODE_RUN_ADDR 0 #define CFG_X86_REFCODE_RUN_ADDR 0
#define VIDEO_IO_OFFSET 0
#define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \ #define CFG_STD_DEVICES_SETTINGS "stdin=usbkbd,i8042-kbd,serial\0" \
"stdout=vidconsole,serial\0" \ "stdout=vidconsole,serial\0" \
"stderr=vidconsole,serial\0" "stderr=vidconsole,serial\0"