[Cbe-oss-dev] cbesim_defconfig update
Sidney Manning
sid at us.ibm.com
Sat Apr 22 08:46:07 EST 2006
Attached is a patch needed so that the current level of the kernel will
boot on the simulator. While the diff is large I think I only set
CONFIG_NET=y and CONFIG_MEMORY_HOTPLUG=y. I've also dropped this into
boe's cvs repository, merged into cbesim_defconfig.diff
Index: cbesim-defconfig.diff
===================================================================
RCS file: /cvs/stiblade/cvs/sw/head/kernel/cbesim-defconfig.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -a -u -r1.3 -r1.4
--- cbesim-defconfig.diff 28 Mar 2006 17:37:19 -0000 1.3
+++ cbesim-defconfig.diff 21 Apr 2006 22:23:34 -0000 1.4
@@ -9,15 +9,15 @@
Signed-off-by: Arnd Bergmann <arndb at de.ibm.com>
-Index: linus-2.6/arch/powerpc/configs/cbesim_defconfig
+Index: linux/arch/powerpc/configs/cbesim_defconfig
===================================================================
--- /dev/null
-+++ linus-2.6/arch/powerpc/configs/cbesim_defconfig
-@@ -0,0 +1,684 @@
++++ linux/arch/powerpc/configs/cbesim_defconfig
+@@ -0,0 +1,777 @@
+#
+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.16-rc1
-+# Tue Jan 17 19:29:41 2006
++# Linux kernel version: 2.6.17-rc1
++# Fri Apr 21 16:57:11 2006
+#
+CONFIG_PPC64=y
+CONFIG_64BIT=y
@@ -25,6 +25,7 @@
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
++CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
@@ -35,6 +36,7 @@
+CONFIG_PPC_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
++# CONFIG_DEFAULT_UIMAGE is not set
+
+#
+# Processor support
@@ -45,15 +47,14 @@
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
++CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_SMP=y
-+# CONFIG_BE_DD1 is not set
+CONFIG_NR_CPUS=4
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
-+CONFIG_CLEAN_COMPILE=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
@@ -64,10 +65,13 @@
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
++# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
++# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_CPUSETS is not set
++# CONFIG_RELAY is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_EMBEDDED is not set
@@ -82,10 +86,6 @@
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
-+CONFIG_CC_ALIGN_FUNCTIONS=0
-+CONFIG_CC_ALIGN_LABELS=0
-+CONFIG_CC_ALIGN_LOOPS=0
-+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
@@ -97,7 +97,6 @@
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
-+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
@@ -106,6 +105,7 @@
+#
+# Block layer
+#
++# CONFIG_BLK_DEV_IO_TRACE is not set
+
+#
+# IO Schedulers
@@ -132,9 +132,7 @@
+# CONFIG_PPC_MAPLE is not set
+CONFIG_PPC_CELL=y
+CONFIG_PPC_SYSTEMSIM=y
-+CONFIG_SYSTEMSIM_IDLE=y
+# CONFIG_U3_DART is not set
-+CONFIG_MPIC=y
+CONFIG_PPC_RTAS=y
+# CONFIG_RTAS_ERROR_LOGGING is not set
+CONFIG_RTAS_PROC=y
@@ -182,9 +180,9 @@
+CONFIG_HAVE_MEMORY_PRESENT=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPARSEMEM_EXTREME=y
-+# CONFIG_MEMORY_HOTPLUG is not set
++CONFIG_MEMORY_HOTPLUG=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
-+CONFIG_MIGRATION=y
++CONFIG_ARCH_MEMORY_PROBE=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_SCHED_SMT=y
+CONFIG_PROC_DEVICETREE=y
@@ -201,7 +199,6 @@
+# CONFIG_PPC_INDIRECT_PCI is not set
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
-+CONFIG_PCI_LEGACY_PROC=y
+# CONFIG_PCI_DEBUG is not set
+
+#
@@ -218,7 +215,42 @@
+#
+# Networking
+#
-+# CONFIG_NET is not set
++CONFIG_NET=y
++
++#
++# Networking options
++#
++# CONFIG_NETDEBUG is not set
++# CONFIG_PACKET is not set
++# CONFIG_UNIX is not set
++# CONFIG_NET_KEY is not set
++# CONFIG_INET is not set
++# CONFIG_NETFILTER is not set
++# CONFIG_ATM is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_VLAN_8021Q is not set
++# CONFIG_DECNET is not set
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++# CONFIG_ATALK is not set
++# CONFIG_X25 is not set
++# CONFIG_LAPB is not set
++# CONFIG_NET_DIVERT is not set
++# CONFIG_WAN_ROUTER is not set
++
++#
++# QoS and/or fair queueing
++#
++# CONFIG_NET_SCHED is not set
++
++#
++# Network testing
++#
++# CONFIG_NET_PKTGEN is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_IRDA is not set
++# CONFIG_BT is not set
++# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
@@ -235,6 +267,7 @@
+#
+# Connector - unified userspace <-> kernelspace linker
+#
++# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
@@ -261,6 +294,7 @@
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
++# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
@@ -268,6 +302,7 @@
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_SYSTEMSIM=y
+# CONFIG_CDROM_PKTCDVD is not set
++# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
@@ -308,12 +343,58 @@
+#
+# Network device support
+#
++# CONFIG_NETDEVICES is not set
++# CONFIG_DUMMY is not set
++# CONFIG_EQUALIZER is not set
++# CONFIG_TUN is not set
++
++#
++# PHY device support
++#
++
++#
++# Ethernet (10 or 100Mbit)
++#
++# CONFIG_NET_ETHERNET is not set
++CONFIG_SYSTEMSIM_NET=y
++
++#
++# Ethernet (1000 Mbit)
++#
++# CONFIG_ACENIC is not set
++# CONFIG_DL2K is not set
++# CONFIG_E1000 is not set
++# CONFIG_NS83820 is not set
++# CONFIG_HAMACHI is not set
++# CONFIG_YELLOWFIN is not set
++# CONFIG_R8169 is not set
++# CONFIG_SIS190 is not set
++# CONFIG_SKGE is not set
++# CONFIG_SKY2 is not set
++# CONFIG_SK98LIN is not set
++# CONFIG_TIGON3 is not set
++# CONFIG_BNX2 is not set
++# CONFIG_SPIDER_NET is not set
++# CONFIG_MV643XX_ETH is not set
++
++#
++# Ethernet (10000 Mbit)
++#
++# CONFIG_CHELSIO_T1 is not set
++# CONFIG_IXGB is not set
++# CONFIG_S2IO is not set
++# CONFIG_FDDI is not set
++# CONFIG_PPP is not set
++# CONFIG_SLIP is not set
++# CONFIG_SHAPER is not set
++# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
++# CONFIG_ISDN is not set
+
+#
+# Telephony Support
@@ -383,6 +464,7 @@
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
++CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -392,11 +474,12 @@
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
++# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_HVC_DRIVER=y
-+CONFIG_HVC_FSS=y
+# CONFIG_HVC_RTAS is not set
++CONFIG_HVC_FSS=y
+
+#
+# IPMI
@@ -420,7 +503,6 @@
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
-+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
@@ -467,10 +549,6 @@
+#
+
+#
-+# Multimedia Capabilities Port drivers
-+#
-+
-+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
@@ -500,6 +578,7 @@
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
++CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
@@ -517,13 +596,23 @@
+# CONFIG_MMC is not set
+
+#
++# LED devices
++#
++# CONFIG_NEW_LEDS is not set
++
++#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
-+# SN Devices
++# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
++#
++
++#
++# Real Time Clock
+#
++# CONFIG_RTC_CLASS is not set
+
+#
+# File systems
@@ -536,6 +625,7 @@
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
++# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
@@ -568,7 +658,6 @@
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_RAMFS=y
-+# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
@@ -587,6 +676,10 @@
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
++
++#
++# Network File Systems
++#
+
+#
+# Partition Types
Sidney Manning -- IBM-STI Design Center Austin, TX
sid at us.ibm.com -- (512) 838-1125, TL/678-1125
More information about the cbe-oss-dev
mailing list