x86: refresh config, enable pci express support

SVN-Revision: 24026

4 files changed, 37 insertions, 29 deletions

diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 9d8fcd3a0e..4c4f1b2841 100644
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -1,9 +1,34 @@
+CONFIG_ACPI=y
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_BUTTON is not set
+# CONFIG_ACPI_CONTAINER is not set
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_DOCK is not set
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_PCI_SLOT is not set
+CONFIG_ACPI_PROCESSOR=y
+# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_PROC_EVENT is not set
+# CONFIG_ACPI_SBS is not set
+CONFIG_ACPI_SYSFS_POWER=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_TOSHIBA is not set
+# CONFIG_ACPI_WMI is not set
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
+CONFIG_DMI=y
+# CONFIG_DMIID is not set
+CONFIG_ILLEGAL_POINTER_VALUE=0
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
@@ -11,6 +36,11 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_YEALINK is not set
+CONFIG_ISA=y
+CONFIG_ISAPNP=y
+CONFIG_ISA_DMA_API=y
+CONFIG_K8_NB=y
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
@@ -22,35 +52,10 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_DMI=y
-# CONFIG_DMIID is not set
-CONFIG_ISA=y
-CONFIG_ISAPNP=y
-CONFIG_ISA_DMA_API=y
+CONFIG_PATA_LEGACY=y
+CONFIG_PATA_PLATFORM=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_ACPI=y
-# CONFIG_ACPI_AC is not set
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_BATTERY is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_BUTTON is not set
-# CONFIG_ACPI_CONTAINER is not set
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_ACPI_DEBUG is not set
-# CONFIG_ACPI_DOCK is not set
-# CONFIG_ACPI_FAN is not set
-# CONFIG_ACPI_PCI_SLOT is not set
-CONFIG_ACPI_PROCESSOR=y
-# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_PROC_EVENT is not set
-# CONFIG_ACPI_SBS is not set
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_TOSHIBA is not set
-# CONFIG_ACPI_WMI is not set
-CONFIG_PATA_LEGACY=y
-CONFIG_PATA_PLATFORM=y
diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default
index 20f10a29c6..8d6e3aee6a 100644
--- a/target/linux/x86/geos/config-default
+++ b/target/linux/x86/geos/config-default
@@ -12,6 +12,7 @@ CONFIG_HWMON=y
 # CONFIG_M486 is not set
 CONFIG_MGEODE_LX=y
 # CONFIG_MOUSE_PS2 is not set
+# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PROCESSOR_SELECT=y
 # CONFIG_SCx200 is not set
diff --git a/target/linux/x86/net5501/config-default b/target/linux/x86/net5501/config-default
index 7484132767..77f6337741 100644
--- a/target/linux/x86/net5501/config-default
+++ b/target/linux/x86/net5501/config-default
@@ -23,6 +23,7 @@ CONFIG_MGEODE_LX=y
 CONFIG_GEODE_MFGPT_TIMER=y
 # CONFIG_NEED_DMA_MAP_STATE is not set
 CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PERF_EVENTS=y
 CONFIG_PROCESSOR_SELECT=y
diff --git a/target/linux/x86/olpc/config-default b/target/linux/x86/olpc/config-default
index e5440f5e6a..368ae8863c 100644
--- a/target/linux/x86/olpc/config-default
+++ b/target/linux/x86/olpc/config-default
@@ -107,6 +107,7 @@ CONFIG_OPROFILE=y
 # CONFIG_PCI_GOANY is not set
 CONFIG_PCI_GOOLPC=y
 CONFIG_PCI_OLPC=y
+# CONFIG_PCIEPORTBUS is not set
 CONFIG_PERF_COUNTERS=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP=y