diff options
| author | Simon Glass <sjg@chromium.org> | 2014-11-14 20:56:39 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-11-25 07:11:16 -0700 |
| commit | ad6edca379117d52da373818a5db3027da2ad14b (patch) | |
| tree | dbee60341b51e7a2ae7e6af5953f4d81d5644972 /drivers/bios_emulator/include | |
| parent | 62d0c5e15347f0ab9998d8bac2845be0d441c8b1 (diff) | |
| download | blackbird-obmc-uboot-ad6edca379117d52da373818a5db3027da2ad14b.tar.gz blackbird-obmc-uboot-ad6edca379117d52da373818a5db3027da2ad14b.zip | |
bios_emulator: Allow x86 to use the emulator
There is an implicit assumption that x86 machines want to use raw I/O in the
BIOS emulator, but this should be selectable. Add an CONFIG_X86EMU_RAW_IO
option to control it instead.
Also fix a few bugs which cause warnings on x86 and adjust the Makefile to
remove the assumption that only PowerPC uses the emulator.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/bios_emulator/include')
| -rw-r--r-- | drivers/bios_emulator/include/x86emu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bios_emulator/include/x86emu.h b/drivers/bios_emulator/include/x86emu.h index a70a76874b..278f669a4b 100644 --- a/drivers/bios_emulator/include/x86emu.h +++ b/drivers/bios_emulator/include/x86emu.h @@ -53,9 +53,9 @@ typedef u16 X86EMU_pioAddr; /*---------------------- Macros and type definitions ----------------------*/ -#if defined (CONFIG_ARM) +#if defined(CONFIG_ARM) #define GAS_LINE_COMMENT "@" -#elif defined(CONFIG_MIPS) || defined(CONFIG_PPC) +#elif defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_X86) #define GAS_LINE_COMMENT "#" #elif defined (CONFIG_SH) #define GAS_LINE_COMMENT "!" |
