diff options
author | Stefano Babic <sbabic@denx.de> | 2015-07-17 11:22:56 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2015-07-17 11:22:56 +0200 |
commit | f448c5d3200372fa73f340144d013fdecf4e2f1f (patch) | |
tree | b17b66f67a22b553f66bcb22e69d62cb2a5bbe7e /include/configs/minnowmax.h | |
parent | 425640256a7c5e9259f7583ee4eca1f3b70f8032 (diff) | |
parent | 605e15db2b54302364a2528d3c6604fbc57be846 (diff) | |
download | blackbird-obmc-uboot-f448c5d3200372fa73f340144d013fdecf4e2f1f.tar.gz blackbird-obmc-uboot-f448c5d3200372fa73f340144d013fdecf4e2f1f.zip |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/configs/minnowmax.h')
-rw-r--r-- | include/configs/minnowmax.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 547765d137..af36ac5caf 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -32,6 +32,7 @@ #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_SIZE 0xe000 +#define CONFIG_PCI_CONFIG_HOST_BRIDGE #define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_RTL8169 @@ -52,9 +53,6 @@ #undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#define CONFIG_X86_OPTION_ROM_FILE vga.bin -#define CONFIG_X86_OPTION_ROM_ADDR 0xfff90000 - #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO #define CONFIG_VGA_AS_SINGLE_DEVICE @@ -65,8 +63,7 @@ /* Avoid a warning in the Realtek Ethernet driver */ #define CONFIG_SYS_CACHELINE_SIZE 16 -/* Environment in SPI flash is unsupported for now */ -#undef CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_ENV_OFFSET 0x007fe000 #endif /* __CONFIG_H */ |