From d2d8cfc657e2fc766cd2c0487397109240cb0427 Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@linux.vnet.ibm.com> Date: Mon, 24 Dec 2007 19:46:29 -0600 Subject: [PATCH] [POWERPC] 4xx: Update defconfigs Update the 4xx board defconfigs Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> --- arch/powerpc/configs/bamboo_defconfig | 22 +++++++--------------- arch/powerpc/configs/ebony_defconfig | 8 ++++++-- arch/powerpc/configs/ep405_defconfig | 9 +++++---- arch/powerpc/configs/katmai_defconfig | 5 +++-- arch/powerpc/configs/kilauea_defconfig | 5 +++-- arch/powerpc/configs/makalu_defconfig | 4 ++-- arch/powerpc/configs/rainier_defconfig | 4 ++-- arch/powerpc/configs/sequoia_defconfig | 10 +++++++--- arch/powerpc/configs/taishan_defconfig | 7 +++++-- arch/powerpc/configs/walnut_defconfig | 5 +++-- 10 files changed, 43 insertions(+), 36 deletions(-) diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig index 76d883e008b62..0dc9c4b4794d4 100644 --- a/arch/powerpc/configs/bamboo_defconfig +++ b/arch/powerpc/configs/bamboo_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Thu Dec 6 16:48:04 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 10:49:50 2007 # # CONFIG_PPC64 is not set @@ -131,6 +131,7 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_PPC4xx_PCI_EXPRESS is not set # # Platform support @@ -143,6 +144,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" CONFIG_BAMBOO=y # CONFIG_EBONY is not set # CONFIG_SEQUOIA is not set +# CONFIG_TAISHAN is not set +# CONFIG_KATMAI is not set +# CONFIG_RAINIER is not set CONFIG_440EP=y CONFIG_IBM440EP_ERR42=y # CONFIG_MPIC is not set @@ -736,19 +740,7 @@ CONFIG_DEBUGGER=y # CONFIG_KGDB is not set # CONFIG_XMON is not set # CONFIG_BDI_SWITCH is not set -CONFIG_PPC_EARLY_DEBUG=y -# CONFIG_PPC_EARLY_DEBUG_LPAR is not set -# CONFIG_PPC_EARLY_DEBUG_G5 is not set -# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set -# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set -# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set -# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set -# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set -# CONFIG_PPC_EARLY_DEBUG_BEAT is not set -CONFIG_PPC_EARLY_DEBUG_44x=y -# CONFIG_PPC_EARLY_DEBUG_CPM is not set -CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 -CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x0 +# CONFIG_PPC_EARLY_DEBUG is not set # # Security options diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig index b84298ce42be8..cf860f166659e 100644 --- a/arch/powerpc/configs/ebony_defconfig +++ b/arch/powerpc/configs/ebony_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Thu Dec 6 16:48:11 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:16:26 2007 # # CONFIG_PPC64 is not set @@ -130,6 +130,7 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_PPC4xx_PCI_EXPRESS is not set # # Platform support @@ -142,6 +143,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_BAMBOO is not set CONFIG_EBONY=y # CONFIG_SEQUOIA is not set +# CONFIG_TAISHAN is not set +# CONFIG_KATMAI is not set +# CONFIG_RAINIER is not set CONFIG_440GP=y # CONFIG_MPIC is not set # CONFIG_MPIC_WEIRD is not set diff --git a/arch/powerpc/configs/ep405_defconfig b/arch/powerpc/configs/ep405_defconfig index 5ddd9d5ec6984..3829c91662569 100644 --- a/arch/powerpc/configs/ep405_defconfig +++ b/arch/powerpc/configs/ep405_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc2 -# Wed Nov 21 16:44:30 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:17:13 2007 # # CONFIG_PPC64 is not set @@ -27,8 +27,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_HARDIRQS=y CONFIG_IRQ_PER_CPU=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_ARCH_HAS_ILOG2_U32=y CONFIG_GENERIC_HWEIGHT=y @@ -67,6 +65,7 @@ CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 @@ -128,6 +127,7 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_PPC4xx_PCI_EXPRESS is not set # # Platform support @@ -139,6 +139,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_PQ2ADS is not set CONFIG_EP405=y # CONFIG_KILAUEA is not set +# CONFIG_MAKALU is not set # CONFIG_WALNUT is not set # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set CONFIG_405GP=y diff --git a/arch/powerpc/configs/katmai_defconfig b/arch/powerpc/configs/katmai_defconfig index 3c23f6021c30f..c8804ec01ea4a 100644 --- a/arch/powerpc/configs/katmai_defconfig +++ b/arch/powerpc/configs/katmai_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Tue Dec 11 17:07:18 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:17:43 2007 # # CONFIG_PPC64 is not set @@ -145,6 +145,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y # CONFIG_SEQUOIA is not set # CONFIG_TAISHAN is not set CONFIG_KATMAI=y +# CONFIG_RAINIER is not set CONFIG_440SPe=y # CONFIG_MPIC is not set # CONFIG_MPIC_WEIRD is not set diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig index f23fe0ce7eaec..c86e7565adc61 100644 --- a/arch/powerpc/configs/kilauea_defconfig +++ b/arch/powerpc/configs/kilauea_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Thu Dec 20 08:24:33 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:18:12 2007 # # CONFIG_PPC64 is not set @@ -137,6 +137,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y # CONFIG_PQ2ADS is not set # CONFIG_EP405 is not set CONFIG_KILAUEA=y +# CONFIG_MAKALU is not set # CONFIG_WALNUT is not set # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set CONFIG_405EX=y diff --git a/arch/powerpc/configs/makalu_defconfig b/arch/powerpc/configs/makalu_defconfig index df65baad2b28b..c5db0265e5d8a 100644 --- a/arch/powerpc/configs/makalu_defconfig +++ b/arch/powerpc/configs/makalu_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Fri Dec 21 07:58:43 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:18:32 2007 # # CONFIG_PPC64 is not set diff --git a/arch/powerpc/configs/rainier_defconfig b/arch/powerpc/configs/rainier_defconfig index 38d94c6114cb4..7b95001a22a80 100644 --- a/arch/powerpc/configs/rainier_defconfig +++ b/arch/powerpc/configs/rainier_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Thu Dec 20 08:43:57 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:22:40 2007 # # CONFIG_PPC64 is not set diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig index bc3c086ddfc0d..2bb4df82fbdad 100644 --- a/arch/powerpc/configs/sequoia_defconfig +++ b/arch/powerpc/configs/sequoia_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Thu Dec 6 16:49:17 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:23:22 2007 # # CONFIG_PPC64 is not set @@ -129,6 +129,7 @@ CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_PPC4xx_PCI_EXPRESS is not set # # Platform support @@ -141,8 +142,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_BAMBOO is not set # CONFIG_EBONY is not set CONFIG_SEQUOIA=y +# CONFIG_TAISHAN is not set +# CONFIG_KATMAI is not set +# CONFIG_RAINIER is not set CONFIG_440EPX=y -CONFIG_440A=y # CONFIG_MPIC is not set # CONFIG_MPIC_WEIRD is not set # CONFIG_PPC_I8259 is not set @@ -811,6 +814,7 @@ CONFIG_PPC_EARLY_DEBUG=y # CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set # CONFIG_PPC_EARLY_DEBUG_BEAT is not set CONFIG_PPC_EARLY_DEBUG_44x=y +# CONFIG_PPC_EARLY_DEBUG_40x is not set # CONFIG_PPC_EARLY_DEBUG_CPM is not set CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1 diff --git a/arch/powerpc/configs/taishan_defconfig b/arch/powerpc/configs/taishan_defconfig index c796582d15570..ade84b92877ed 100644 --- a/arch/powerpc/configs/taishan_defconfig +++ b/arch/powerpc/configs/taishan_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Tue Dec 11 16:44:44 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:23:39 2007 # # CONFIG_PPC64 is not set @@ -144,6 +144,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_EBONY is not set # CONFIG_SEQUOIA is not set CONFIG_TAISHAN=y +# CONFIG_KATMAI is not set +# CONFIG_RAINIER is not set CONFIG_440GX=y # CONFIG_MPIC is not set # CONFIG_MPIC_WEIRD is not set @@ -736,6 +738,7 @@ CONFIG_DEBUGGER=y # CONFIG_KGDB is not set # CONFIG_XMON is not set # CONFIG_BDI_SWITCH is not set +# CONFIG_PPC_EARLY_DEBUG is not set # # Security options diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig index f6751fd02921c..e431128e8e9e8 100644 --- a/arch/powerpc/configs/walnut_defconfig +++ b/arch/powerpc/configs/walnut_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Thu Dec 20 08:18:28 2007 +# Linux kernel version: 2.6.24-rc6 +# Mon Dec 24 11:23:58 2007 # # CONFIG_PPC64 is not set @@ -139,6 +139,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_PQ2ADS is not set # CONFIG_EP405 is not set # CONFIG_KILAUEA is not set +# CONFIG_MAKALU is not set CONFIG_WALNUT=y # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set CONFIG_405GP=y -- GitLab