aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-24 20:46:29 -0500
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-24 20:46:29 -0500
commitd2d8cfc657e2fc766cd2c0487397109240cb0427 (patch)
tree74451e61ec7bbefb61e715a4be306db807d59698
parent67196d7275fcbc62c41c34400855d3d3c95d8d1d (diff)
[POWERPC] 4xx: Update defconfigs
Update the 4xx board defconfigs Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-rw-r--r--arch/powerpc/configs/bamboo_defconfig22
-rw-r--r--arch/powerpc/configs/ebony_defconfig8
-rw-r--r--arch/powerpc/configs/ep405_defconfig9
-rw-r--r--arch/powerpc/configs/katmai_defconfig5
-rw-r--r--arch/powerpc/configs/kilauea_defconfig5
-rw-r--r--arch/powerpc/configs/makalu_defconfig4
-rw-r--r--arch/powerpc/configs/rainier_defconfig4
-rw-r--r--arch/powerpc/configs/sequoia_defconfig10
-rw-r--r--arch/powerpc/configs/taishan_defconfig7
-rw-r--r--arch/powerpc/configs/walnut_defconfig5
10 files changed, 43 insertions, 36 deletions
diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig
index 76d883e008b6..0dc9c4b4794d 100644
--- a/arch/powerpc/configs/bamboo_defconfig
+++ b/arch/powerpc/configs/bamboo_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Thu Dec 6 16:48:04 2007 4# Mon Dec 24 10:49:50 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -131,6 +131,7 @@ CONFIG_DEFAULT_AS=y
131# CONFIG_DEFAULT_CFQ is not set 131# CONFIG_DEFAULT_CFQ is not set
132# CONFIG_DEFAULT_NOOP is not set 132# CONFIG_DEFAULT_NOOP is not set
133CONFIG_DEFAULT_IOSCHED="anticipatory" 133CONFIG_DEFAULT_IOSCHED="anticipatory"
134# CONFIG_PPC4xx_PCI_EXPRESS is not set
134 135
135# 136#
136# Platform support 137# Platform support
@@ -143,6 +144,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
143CONFIG_BAMBOO=y 144CONFIG_BAMBOO=y
144# CONFIG_EBONY is not set 145# CONFIG_EBONY is not set
145# CONFIG_SEQUOIA is not set 146# CONFIG_SEQUOIA is not set
147# CONFIG_TAISHAN is not set
148# CONFIG_KATMAI is not set
149# CONFIG_RAINIER is not set
146CONFIG_440EP=y 150CONFIG_440EP=y
147CONFIG_IBM440EP_ERR42=y 151CONFIG_IBM440EP_ERR42=y
148# CONFIG_MPIC is not set 152# CONFIG_MPIC is not set
@@ -736,19 +740,7 @@ CONFIG_DEBUGGER=y
736# CONFIG_KGDB is not set 740# CONFIG_KGDB is not set
737# CONFIG_XMON is not set 741# CONFIG_XMON is not set
738# CONFIG_BDI_SWITCH is not set 742# CONFIG_BDI_SWITCH is not set
739CONFIG_PPC_EARLY_DEBUG=y 743# CONFIG_PPC_EARLY_DEBUG is not set
740# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
741# CONFIG_PPC_EARLY_DEBUG_G5 is not set
742# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
743# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
744# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
745# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
746# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
747# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
748CONFIG_PPC_EARLY_DEBUG_44x=y
749# CONFIG_PPC_EARLY_DEBUG_CPM is not set
750CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
751CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x0
752 744
753# 745#
754# Security options 746# Security options
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index b84298ce42be..cf860f166659 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Thu Dec 6 16:48:11 2007 4# Mon Dec 24 11:16:26 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -130,6 +130,7 @@ CONFIG_DEFAULT_AS=y
130# CONFIG_DEFAULT_CFQ is not set 130# CONFIG_DEFAULT_CFQ is not set
131# CONFIG_DEFAULT_NOOP is not set 131# CONFIG_DEFAULT_NOOP is not set
132CONFIG_DEFAULT_IOSCHED="anticipatory" 132CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PPC4xx_PCI_EXPRESS is not set
133 134
134# 135#
135# Platform support 136# Platform support
@@ -142,6 +143,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
142# CONFIG_BAMBOO is not set 143# CONFIG_BAMBOO is not set
143CONFIG_EBONY=y 144CONFIG_EBONY=y
144# CONFIG_SEQUOIA is not set 145# CONFIG_SEQUOIA is not set
146# CONFIG_TAISHAN is not set
147# CONFIG_KATMAI is not set
148# CONFIG_RAINIER is not set
145CONFIG_440GP=y 149CONFIG_440GP=y
146# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
147# CONFIG_MPIC_WEIRD is not set 151# CONFIG_MPIC_WEIRD is not set
diff --git a/arch/powerpc/configs/ep405_defconfig b/arch/powerpc/configs/ep405_defconfig
index 5ddd9d5ec698..3829c9166256 100644
--- a/arch/powerpc/configs/ep405_defconfig
+++ b/arch/powerpc/configs/ep405_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc2 3# Linux kernel version: 2.6.24-rc6
4# Wed Nov 21 16:44:30 2007 4# Mon Dec 24 11:17:13 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -27,8 +27,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y 27CONFIG_GENERIC_CLOCKEVENTS=y
28CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
29CONFIG_IRQ_PER_CPU=y 29CONFIG_IRQ_PER_CPU=y
30CONFIG_STACKTRACE_SUPPORT=y
31CONFIG_LOCKDEP_SUPPORT=y
32CONFIG_RWSEM_XCHGADD_ALGORITHM=y 30CONFIG_RWSEM_XCHGADD_ALGORITHM=y
33CONFIG_ARCH_HAS_ILOG2_U32=y 31CONFIG_ARCH_HAS_ILOG2_U32=y
34CONFIG_GENERIC_HWEIGHT=y 32CONFIG_GENERIC_HWEIGHT=y
@@ -67,6 +65,7 @@ CONFIG_POSIX_MQUEUE=y
67# CONFIG_BSD_PROCESS_ACCT is not set 65# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 66# CONFIG_TASKSTATS is not set
69# CONFIG_USER_NS is not set 67# CONFIG_USER_NS is not set
68# CONFIG_PID_NS is not set
70# CONFIG_AUDIT is not set 69# CONFIG_AUDIT is not set
71# CONFIG_IKCONFIG is not set 70# CONFIG_IKCONFIG is not set
72CONFIG_LOG_BUF_SHIFT=14 71CONFIG_LOG_BUF_SHIFT=14
@@ -128,6 +127,7 @@ CONFIG_DEFAULT_AS=y
128# CONFIG_DEFAULT_CFQ is not set 127# CONFIG_DEFAULT_CFQ is not set
129# CONFIG_DEFAULT_NOOP is not set 128# CONFIG_DEFAULT_NOOP is not set
130CONFIG_DEFAULT_IOSCHED="anticipatory" 129CONFIG_DEFAULT_IOSCHED="anticipatory"
130# CONFIG_PPC4xx_PCI_EXPRESS is not set
131 131
132# 132#
133# Platform support 133# Platform support
@@ -139,6 +139,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
139# CONFIG_PQ2ADS is not set 139# CONFIG_PQ2ADS is not set
140CONFIG_EP405=y 140CONFIG_EP405=y
141# CONFIG_KILAUEA is not set 141# CONFIG_KILAUEA is not set
142# CONFIG_MAKALU is not set
142# CONFIG_WALNUT is not set 143# CONFIG_WALNUT is not set
143# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 144# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
144CONFIG_405GP=y 145CONFIG_405GP=y
diff --git a/arch/powerpc/configs/katmai_defconfig b/arch/powerpc/configs/katmai_defconfig
index 3c23f6021c30..c8804ec01ea4 100644
--- a/arch/powerpc/configs/katmai_defconfig
+++ b/arch/powerpc/configs/katmai_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Tue Dec 11 17:07:18 2007 4# Mon Dec 24 11:17:43 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -145,6 +145,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
145# CONFIG_SEQUOIA is not set 145# CONFIG_SEQUOIA is not set
146# CONFIG_TAISHAN is not set 146# CONFIG_TAISHAN is not set
147CONFIG_KATMAI=y 147CONFIG_KATMAI=y
148# CONFIG_RAINIER is not set
148CONFIG_440SPe=y 149CONFIG_440SPe=y
149# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
150# CONFIG_MPIC_WEIRD is not set 151# CONFIG_MPIC_WEIRD is not set
diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig
index f23fe0ce7eae..c86e7565adc6 100644
--- a/arch/powerpc/configs/kilauea_defconfig
+++ b/arch/powerpc/configs/kilauea_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Thu Dec 20 08:24:33 2007 4# Mon Dec 24 11:18:12 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -137,6 +137,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
137# CONFIG_PQ2ADS is not set 137# CONFIG_PQ2ADS is not set
138# CONFIG_EP405 is not set 138# CONFIG_EP405 is not set
139CONFIG_KILAUEA=y 139CONFIG_KILAUEA=y
140# CONFIG_MAKALU is not set
140# CONFIG_WALNUT is not set 141# CONFIG_WALNUT is not set
141# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 142# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
142CONFIG_405EX=y 143CONFIG_405EX=y
diff --git a/arch/powerpc/configs/makalu_defconfig b/arch/powerpc/configs/makalu_defconfig
index df65baad2b28..c5db0265e5d8 100644
--- a/arch/powerpc/configs/makalu_defconfig
+++ b/arch/powerpc/configs/makalu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Fri Dec 21 07:58:43 2007 4# Mon Dec 24 11:18:32 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
diff --git a/arch/powerpc/configs/rainier_defconfig b/arch/powerpc/configs/rainier_defconfig
index 38d94c6114cb..7b95001a22a8 100644
--- a/arch/powerpc/configs/rainier_defconfig
+++ b/arch/powerpc/configs/rainier_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Thu Dec 20 08:43:57 2007 4# Mon Dec 24 11:22:40 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig
index bc3c086ddfc0..2bb4df82fbda 100644
--- a/arch/powerpc/configs/sequoia_defconfig
+++ b/arch/powerpc/configs/sequoia_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Thu Dec 6 16:49:17 2007 4# Mon Dec 24 11:23:22 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -129,6 +129,7 @@ CONFIG_DEFAULT_AS=y
129# CONFIG_DEFAULT_CFQ is not set 129# CONFIG_DEFAULT_CFQ is not set
130# CONFIG_DEFAULT_NOOP is not set 130# CONFIG_DEFAULT_NOOP is not set
131CONFIG_DEFAULT_IOSCHED="anticipatory" 131CONFIG_DEFAULT_IOSCHED="anticipatory"
132# CONFIG_PPC4xx_PCI_EXPRESS is not set
132 133
133# 134#
134# Platform support 135# Platform support
@@ -141,8 +142,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
141# CONFIG_BAMBOO is not set 142# CONFIG_BAMBOO is not set
142# CONFIG_EBONY is not set 143# CONFIG_EBONY is not set
143CONFIG_SEQUOIA=y 144CONFIG_SEQUOIA=y
145# CONFIG_TAISHAN is not set
146# CONFIG_KATMAI is not set
147# CONFIG_RAINIER is not set
144CONFIG_440EPX=y 148CONFIG_440EPX=y
145CONFIG_440A=y
146# CONFIG_MPIC is not set 149# CONFIG_MPIC is not set
147# CONFIG_MPIC_WEIRD is not set 150# CONFIG_MPIC_WEIRD is not set
148# CONFIG_PPC_I8259 is not set 151# CONFIG_PPC_I8259 is not set
@@ -811,6 +814,7 @@ CONFIG_PPC_EARLY_DEBUG=y
811# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 814# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
812# CONFIG_PPC_EARLY_DEBUG_BEAT is not set 815# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
813CONFIG_PPC_EARLY_DEBUG_44x=y 816CONFIG_PPC_EARLY_DEBUG_44x=y
817# CONFIG_PPC_EARLY_DEBUG_40x is not set
814# CONFIG_PPC_EARLY_DEBUG_CPM is not set 818# CONFIG_PPC_EARLY_DEBUG_CPM is not set
815CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 819CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
816CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1 820CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
diff --git a/arch/powerpc/configs/taishan_defconfig b/arch/powerpc/configs/taishan_defconfig
index c796582d1557..ade84b92877e 100644
--- a/arch/powerpc/configs/taishan_defconfig
+++ b/arch/powerpc/configs/taishan_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Tue Dec 11 16:44:44 2007 4# Mon Dec 24 11:23:39 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -144,6 +144,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
144# CONFIG_EBONY is not set 144# CONFIG_EBONY is not set
145# CONFIG_SEQUOIA is not set 145# CONFIG_SEQUOIA is not set
146CONFIG_TAISHAN=y 146CONFIG_TAISHAN=y
147# CONFIG_KATMAI is not set
148# CONFIG_RAINIER is not set
147CONFIG_440GX=y 149CONFIG_440GX=y
148# CONFIG_MPIC is not set 150# CONFIG_MPIC is not set
149# CONFIG_MPIC_WEIRD is not set 151# CONFIG_MPIC_WEIRD is not set
@@ -736,6 +738,7 @@ CONFIG_DEBUGGER=y
736# CONFIG_KGDB is not set 738# CONFIG_KGDB is not set
737# CONFIG_XMON is not set 739# CONFIG_XMON is not set
738# CONFIG_BDI_SWITCH is not set 740# CONFIG_BDI_SWITCH is not set
741# CONFIG_PPC_EARLY_DEBUG is not set
739 742
740# 743#
741# Security options 744# Security options
diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig
index f6751fd02921..e431128e8e9e 100644
--- a/arch/powerpc/configs/walnut_defconfig
+++ b/arch/powerpc/configs/walnut_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc4 3# Linux kernel version: 2.6.24-rc6
4# Thu Dec 20 08:18:28 2007 4# Mon Dec 24 11:23:58 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -139,6 +139,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
139# CONFIG_PQ2ADS is not set 139# CONFIG_PQ2ADS is not set
140# CONFIG_EP405 is not set 140# CONFIG_EP405 is not set
141# CONFIG_KILAUEA is not set 141# CONFIG_KILAUEA is not set
142# CONFIG_MAKALU is not set
142CONFIG_WALNUT=y 143CONFIG_WALNUT=y
143# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set 144# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
144CONFIG_405GP=y 145CONFIG_405GP=y