diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-26 17:48:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-26 17:48:05 -0400 |
| commit | 79c884d7e449a63fa8f07b7495f8f9873355c48f (patch) | |
| tree | 19adcc1b9d3520a68937a1f5f81b06775c790d8a /include/configs | |
| parent | ad608a21f89bf7467059ed59d60b080aace7ef99 (diff) | |
| parent | f4b5db7c5309dd7f3ecc6369f3c1f41e8bfe93ae (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/bayleybay.h | 1 | ||||
| -rw-r--r-- | include/configs/crownbay.h | 4 | ||||
| -rw-r--r-- | include/configs/minnowmax.h | 1 | ||||
| -rw-r--r-- | include/configs/qemu-x86.h | 1 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 3 |
5 files changed, 3 insertions, 7 deletions
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index d37a865d1d..1ba2998d54 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_ARCH_MISC_INIT -#define CONFIG_PCI_CONFIG_HOST_BRIDGE #define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 57a9512f07..998da78842 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -31,7 +31,6 @@ #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 @@ -54,9 +53,6 @@ #define CONFIG_PCH_GBE #define CONFIG_PHYLIB -/* TunnelCreek IGD support */ -#define CONFIG_VGA_AS_SINGLE_DEVICE - /* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0 diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index aeb04b96b4..53d86a2778 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -19,7 +19,6 @@ #define CONFIG_SMSC_LPC47M -#define CONFIG_PCI_CONFIG_HOST_BRIDGE #define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_RTL8169 diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 72df64e365..1b544c119e 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -28,7 +28,6 @@ #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_SIZE 0xe000 -#define CONFIG_PCI_CONFIG_HOST_BRIDGE #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga\0" \ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 349b06cb76..217312e5b7 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -87,7 +87,9 @@ #define CONFIG_ISO_PARTITION /* Experimental */ #define CONFIG_CMD_PART +#ifdef CONFIG_SYS_COREBOOT #define CONFIG_CMD_CBFS +#endif #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE #define CONFIG_PARTITION_UUIDS @@ -190,6 +192,7 @@ * PCI configuration */ #define CONFIG_PCI +#define CONFIG_PCI_CONFIG_HOST_BRIDGE /*----------------------------------------------------------------------- * USB configuration |