diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-13 10:02:43 -0500 |
| commit | b67dfc5a1099eef2a323de23a78ba4e6d9b87633 (patch) | |
| tree | e23ed37c2736481bd5cbf58f4d8aab57381005e9 /include | |
| parent | 439fcb9b4f717f5a583014acb3e75b789564867c (diff) | |
| parent | 6d41027fe2e734aa1e15fabc1523417b3b871691 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/bayleybay.h | 1 | ||||
| -rw-r--r-- | include/configs/crownbay.h | 13 | ||||
| -rw-r--r-- | include/configs/galileo.h | 1 | ||||
| -rw-r--r-- | include/configs/minnowmax.h | 1 | ||||
| -rw-r--r-- | include/configs/qemu-x86.h | 13 | ||||
| -rw-r--r-- | include/configs/som-6896.h | 1 | ||||
| -rw-r--r-- | include/configs/x86-chromebook.h | 1 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 3 |
8 files changed, 1 insertions, 33 deletions
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 1ba2998d54..b102c689e2 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_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga,usbkbd\0" \ diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 7f91ffffa5..54a2905c1d 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -20,19 +20,6 @@ #define CONFIG_SMSC_LPC47M -#define CONFIG_PCI_MEM_BUS 0x40000000 -#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -#define CONFIG_PCI_MEM_SIZE 0x80000000 - -#define CONFIG_PCI_PREF_BUS 0xc0000000 -#define CONFIG_PCI_PREF_PHYS CONFIG_PCI_PREF_BUS -#define CONFIG_PCI_PREF_SIZE 0x20000000 - -#define CONFIG_PCI_IO_BUS 0x2000 -#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS -#define CONFIG_PCI_IO_SIZE 0xe000 - -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga,usbkbd\0" \ diff --git a/include/configs/galileo.h b/include/configs/galileo.h index ba6c8f172b..eb16a5eaca 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -21,7 +21,6 @@ /* ns16550 UART is memory-mapped in Quark SoC */ #undef CONFIG_SYS_NS16550_PORT_MAPPED -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial\0" \ diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 53d86a2778..a20552e74e 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -19,7 +19,6 @@ #define CONFIG_SMSC_LPC47M -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_RTL8169 #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \ diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 1b544c119e..ecb385c0b3 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -15,18 +15,7 @@ #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_ARCH_MISC_INIT - -#define CONFIG_PCI_MEM_BUS 0xc0000000 -#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -#define CONFIG_PCI_MEM_SIZE 0x10000000 - -#define CONFIG_PCI_PREF_BUS 0xd0000000 -#define CONFIG_PCI_PREF_PHYS CONFIG_PCI_PREF_BUS -#define CONFIG_PCI_PREF_SIZE 0x10000000 - -#define CONFIG_PCI_IO_BUS 0x2000 -#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS -#define CONFIG_PCI_IO_SIZE 0xe000 +#define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_PCI_PNP diff --git a/include/configs/som-6896.h b/include/configs/som-6896.h index 300e9dfc39..43a9623f04 100644 --- a/include/configs/som-6896.h +++ b/include/configs/som-6896.h @@ -20,7 +20,6 @@ #define CONFIG_SCSI_DEV_LIST \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_AHCI} -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define VIDEO_IO_OFFSET 0 diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h index 2be885079e..b0aa875f5e 100644 --- a/include/configs/x86-chromebook.h +++ b/include/configs/x86-chromebook.h @@ -35,7 +35,6 @@ #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_SIZE 0xefff -#define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP #define CONFIG_BIOSEMU diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index faadab83ce..ab9fa0b082 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -155,9 +155,6 @@ */ #define CONFIG_SYS_X86_TSC_TIMER -#define CONFIG_SYS_PCAT_INTERRUPTS -#define CONFIG_SYS_PCAT_TIMER -#define CONFIG_SYS_NUM_IRQS 16 #define CONFIG_SYS_STACK_SIZE (32 * 1024) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE |