Merge branch 'master' of git://git.denx.de/u-boot-x86
This commit is contained in:
@@ -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" \
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user