[PATCH 1/1] x86: move additional oddball PATA drivers

These should only be enabled in the generic image, as they bloat all of the other targets.
Also add symbols for NET5501, ALIX, and GEOS which were added backported to 3.2 and 3.3.
Restore PC speaker to Geos target.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 30019

diff --git a/target/linux/x86/alix2/config-default b/target/linux/x86/alix2/config-default
index def5482ad39fec2ba7498ef78132aac88c22bfd3..7d4f8d82f39182098c25034b5a2d5e937715bd65 100644 (file)
--- a/target/linux/x86/alix2/config-default
+++ b/target/linux/x86/alix2/config-default
@@ -15,6 +15,10 @@ CONFIG_HWMON=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MGEODE_LX=y
 CONFIG_PATA_CS5536=y
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_VIA is not set
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_POWER_SUPPLY is not set

diff --git a/target/linux/x86/config-3.2 b/target/linux/x86/config-3.2
index fa131aa0ade7e5434dfe527bcea9c3adc4465399..75503f8a20b3e9cc96ea0925fce6d4ac4bcb6dd6 100644 (file)
--- a/target/linux/x86/config-3.2
+++ b/target/linux/x86/config-3.2
@@ -237,6 +237,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_NET5501 is not set
 # CONFIG_NET_NS is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NO_BOOTMEM=y
@@ -249,10 +250,6 @@ CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_VIA=y
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y

diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 5dd172bfd13335e6784166ac950b17cd6a5274ed..9b7b614462c90f8ad13812414058f830a3367019 100644 (file)
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -246,10 +246,10 @@ CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_VIA=y
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_VIA is not set
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y

diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 252e938187ed6526acd5ef943a67ca7d7fe69f14..0b8ae22631b8789726a00650835610e0bea6d9c6 100644 (file)
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -52,9 +52,13 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
+CONFIG_PATA_AMD=y
 CONFIG_PATA_LEGACY=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_OLDPIIX=y
 CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_AMD=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_VIA=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_VT=y

diff --git a/target/linux/x86/geos/config-default b/target/linux/x86/geos/config-default
index ee9f24dc5aa4f18a3ce1fdba566ff32bcf0c5d91..6d4fe037c4d9b8284f5063be186e941fe917e455 100644 (file)
--- a/target/linux/x86/geos/config-default
+++ b/target/linux/x86/geos/config-default
@@ -5,6 +5,7 @@ CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 # CONFIG_FB_GEODE is not set
 CONFIG_GENERIC_GPIO=y
+CONFIG_GEOS=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HIGHMEM64G is not set
@@ -15,7 +16,8 @@ CONFIG_HWMON=y
 # CONFIG_M486 is not set
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MGEODE_LX=y
-CONFIG_GEOS=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PATA_CS5536=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_SCx200 is not set