aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-07-29 14:59:08 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-07-29 14:59:08 +0000
commitb88b62a2eaa8519eeb2f78500473218d44266783 (patch)
treeb268069d0e25fede642e61d0f720af1ef008aedc
parentcf001a84b3972a1f5f9e67d453646c7797247def (diff)
downloadupstream-b88b62a2eaa8519eeb2f78500473218d44266783.tar.gz
upstream-b88b62a2eaa8519eeb2f78500473218d44266783.tar.bz2
upstream-b88b62a2eaa8519eeb2f78500473218d44266783.zip
move some PPC symbols to the generic config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17041 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/config-2.6.3010
-rw-r--r--target/linux/ppc40x/config-2.6.308
2 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index e26b2df1d2..d8b21f48c2 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1,3 +1,13 @@
+# CONFIG_REDWOOD is not set
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_HVC_UDBG is not set
+CONFIG_STDBINUTILS=y
# CONFIG_6PACK is not set
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
diff --git a/target/linux/ppc40x/config-2.6.30 b/target/linux/ppc40x/config-2.6.30
index b650877fe3..c3c5702bcc 100644
--- a/target/linux/ppc40x/config-2.6.30
+++ b/target/linux/ppc40x/config-2.6.30
@@ -85,7 +85,6 @@ CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_OPROFILE=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
# CONFIG_HCU4 is not set
-# CONFIG_HVC_UDBG is not set
CONFIG_HW_RANDOM=y
CONFIG_HZ=250
# CONFIG_HZ_100 is not set
@@ -133,7 +132,6 @@ CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
CONFIG_PCI=y
CONFIG_PCIEAER=y
-# CONFIG_PCIEASPM is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y
@@ -145,10 +143,6 @@ CONFIG_PPC32=y
CONFIG_PPC40x_SIMPLE=y
CONFIG_PPC4xx_PCI_EXPRESS=y
# CONFIG_PPC64 is not set
-# CONFIG_PPC_16K_PAGES is not set
-# CONFIG_PPC_256K_PAGES is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
# CONFIG_PPC_85xx is not set
# CONFIG_PPC_8xx is not set
# CONFIG_PPC_970_NAP is not set
@@ -183,8 +177,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_RSA is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
-# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
-# CONFIG_SIMPLE_GPIO is not set
# CONFIG_SLAB is not set
# CONFIG_SLOW_WORK is not set
CONFIG_SLUB=y