Commit 7c12c92f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] mpc5200: Fix incorrect compatible string for the mdio node
  [POWERPC] Update some defconfigs
parents 5a17558f 16fddf54

arch/powerpc/boot/dts/lite5200b.dts

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ 
		mdio@3000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "fsl,mpc5200b-mdio";

			compatible = "fsl,mpc5200b-mdio", "fsl,mpc5200-mdio";

			reg = <3000 400>;	// fec range, since we need to setup fec interrupts

			interrupts = <2 5 0>;	// these are for "mii command finished", not link changes & co.

			interrupt-parent = <&mpc5200_pic>;

arch/powerpc/configs/ep8248e_defconfig

+54 −20
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc6

# Fri Jan 11 14:02:06 2008

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:09 2008

#

# CONFIG_PPC64 is not set
@@ -28,6 +28,7 @@ CONFIG_GENERIC_TIME=y 
CONFIG_GENERIC_TIME_VSYSCALL=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_HARDIRQS=y

# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set

CONFIG_IRQ_PER_CPU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -69,11 +70,14 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

# CONFIG_CGROUPS is not set

CONFIG_GROUP_SCHED=y

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_SYSCTL=y

CONFIG_EMBEDDED=y
@@ -85,17 +89,26 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -117,6 +130,7 @@ CONFIG_DEFAULT_DEADLINE=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="deadline"

CONFIG_CLASSIC_RCU=y



#

# Platform support
@@ -125,8 +139,8 @@ CONFIG_DEFAULT_IOSCHED="deadline" 
CONFIG_PPC_82xx=y

# CONFIG_PPC_83xx is not set

# CONFIG_PPC_86xx is not set

# CONFIG_PPC_MPC52xx is not set

# CONFIG_PPC_MPC5200 is not set

# CONFIG_PPC_MPC512x is not set

# CONFIG_PPC_MPC5121 is not set

# CONFIG_PPC_CELL is not set

# CONFIG_PPC_CELL_NATIVE is not set

# CONFIG_MPC8272_ADS is not set
@@ -135,6 +149,7 @@ CONFIG_EP8248E=y 
# CONFIG_PQ2ADS is not set

CONFIG_8260=y

CONFIG_8272=y

# CONFIG_IPIC is not set

# CONFIG_MPIC is not set

# CONFIG_MPIC_WEIRD is not set

# CONFIG_PPC_I8259 is not set
@@ -163,12 +178,16 @@ CONFIG_HZ_250=y 
# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

# CONFIG_SCHED_HRTICK is not set

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=y

# CONFIG_IOMMU_HELPER is not set

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_HAS_WALK_MEMORY=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_FLATMEM=y
@@ -183,11 +202,7 @@ CONFIG_VIRT_TO_BUS=y 
CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set

# CONFIG_PM is not set

CONFIG_SUSPEND_UP_POSSIBLE=y

CONFIG_HIBERNATION_UP_POSSIBLE=y

# CONFIG_SECCOMP is not set

CONFIG_WANT_DEVICE_TREE=y

CONFIG_DEVICE_TREE="ep8248e.dts"

CONFIG_ISA_DMA_API=y



#
@@ -272,12 +287,13 @@ CONFIG_IPV6_SIT=y 
# CONFIG_NETWORK_SECMARK is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set

CONFIG_NETFILTER_ADVANCED=y



#

# Core Netfilter Configuration

#

# CONFIG_NETFILTER_NETLINK is not set

# CONFIG_NF_CONNTRACK_ENABLED is not set

# CONFIG_NETFILTER_NETLINK_QUEUE is not set

# CONFIG_NETFILTER_NETLINK_LOG is not set

# CONFIG_NF_CONNTRACK is not set

# CONFIG_NETFILTER_XTABLES is not set
@@ -287,6 +303,13 @@ CONFIG_NETFILTER=y 
# CONFIG_IP_NF_QUEUE is not set

# CONFIG_IP_NF_IPTABLES is not set

# CONFIG_IP_NF_ARPTABLES is not set



#

# IPv6: Netfilter Configuration

#

# CONFIG_IP6_NF_QUEUE is not set

# CONFIG_IP6_NF_IPTABLES is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set
@@ -300,6 +323,7 @@ CONFIG_NETFILTER=y 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -308,6 +332,7 @@ CONFIG_NETFILTER=y 
#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set
@@ -415,6 +440,7 @@ CONFIG_BLK_DEV_LOOP=y 
# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set



#
@@ -448,6 +474,7 @@ CONFIG_DAVICOM_PHY=y 
# CONFIG_SMSC_PHY is not set

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_FIXED_PHY is not set

CONFIG_MDIO_BITBANG=y

CONFIG_NET_ETHERNET=y
@@ -462,6 +489,8 @@ CONFIG_FS_ENET=y 
CONFIG_FS_ENET_HAS_FCC=y

# CONFIG_FS_ENET_MDIO_FCC is not set

CONFIG_NETDEV_1000=y

# CONFIG_E1000E_ENABLED is not set

# CONFIG_GIANFAR is not set

CONFIG_NETDEV_10000=y



#
@@ -532,6 +561,7 @@ CONFIG_HW_RANDOM=y 
# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_WATCHDOG is not set



#
@@ -571,8 +601,10 @@ CONFIG_DAB=y 
# CONFIG_SOUND is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set



#

# Userspace I/O
@@ -593,12 +625,10 @@ CONFIG_JBD=y 
# 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_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

CONFIG_AUTOFS4_FS=y

# CONFIG_FUSE_FS is not set
@@ -626,6 +656,7 @@ CONFIG_SYSFS=y 
CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set

# CONFIG_HUGETLB_PAGE is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems
@@ -634,8 +665,10 @@ CONFIG_TMPFS=y 
# CONFIG_JFFS2_FS is not set

CONFIG_CRAMFS=y

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y
@@ -715,7 +748,6 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_KOI8_R is not set

# CONFIG_NLS_KOI8_U is not set

CONFIG_NLS_UTF8=y

# CONFIG_UCC_SLOW is not set



#

# Library routines
@@ -731,9 +763,6 @@ CONFIG_PLIST=y 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_INSTRUMENTATION=y

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set



#

# Kernel hacking
@@ -764,8 +793,8 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set

# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -784,6 +813,7 @@ CONFIG_BDI_SWITCH=y 
CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=y

# CONFIG_CRYPTO_SEQIV is not set

CONFIG_CRYPTO_MANAGER=y

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_NULL is not set
@@ -797,6 +827,9 @@ CONFIG_CRYPTO_MD5=y 
CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_PCBC=y

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set
@@ -816,6 +849,7 @@ CONFIG_CRYPTO_DES=y 
# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_LZO is not set

# CONFIG_CRYPTO_HW is not set

# CONFIG_PPC_CLOCK is not set

CONFIG_PPC_LIB_RHEAP=y

arch/powerpc/configs/ep88xc_defconfig

+38 −18
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc4

# Thu Dec  6 16:48:13 2007

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:10 2008

#

# CONFIG_PPC64 is not set
@@ -26,6 +26,7 @@ CONFIG_GENERIC_TIME=y 
CONFIG_GENERIC_TIME_VSYSCALL=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_HARDIRQS=y

# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set

CONFIG_IRQ_PER_CPU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -63,15 +64,19 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_POSIX_MQUEUE is not set

# 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

# CONFIG_CGROUPS is not set

CONFIG_GROUP_SCHED=y

# CONFIG_FAIR_GROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y
@@ -84,11 +89,13 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

# CONFIG_ELF_CORE is not set

CONFIG_COMPAT_BRK=y

# CONFIG_BASE_FULL is not set

# CONFIG_FUTEX is not set

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

# CONFIG_VM_EVENT_COUNTERS is not set
@@ -96,6 +103,13 @@ CONFIG_SLUB_DEBUG=y 
# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=1

# CONFIG_MODULES is not set
@@ -117,12 +131,13 @@ CONFIG_DEFAULT_DEADLINE=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="deadline"

CONFIG_CLASSIC_RCU=y



#

# Platform support

#

# CONFIG_PPC_MPC52xx is not set

# CONFIG_PPC_MPC5200 is not set

# CONFIG_PPC_MPC512x is not set

# CONFIG_PPC_MPC5121 is not set

# CONFIG_PPC_CELL is not set

# CONFIG_PPC_CELL_NATIVE is not set

CONFIG_CPM1=y
@@ -130,6 +145,7 @@ CONFIG_CPM1=y 
# CONFIG_MPC86XADS is not set

# CONFIG_MPC885ADS is not set

CONFIG_PPC_EP88XC=y

# CONFIG_PPC_ADDER875 is not set



#

# MPC8xx CPM Options
@@ -146,6 +162,7 @@ CONFIG_NO_UCODE_PATCH=y 
# CONFIG_I2C_SPI_UCODE_PATCH is not set

# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set

# CONFIG_PQ2ADS is not set

# CONFIG_IPIC is not set

# CONFIG_MPIC is not set

# CONFIG_MPIC_WEIRD is not set

# CONFIG_PPC_I8259 is not set
@@ -156,7 +173,6 @@ CONFIG_NO_UCODE_PATCH=y 
# CONFIG_PPC_INDIRECT_IO is not set

# CONFIG_GENERIC_IOMAP is not set

# CONFIG_CPU_FREQ is not set

# CONFIG_CPM2 is not set

CONFIG_PPC_CPM_NEW_BINDING=y

# CONFIG_FSL_ULI1575 is not set

CONFIG_CPM=y
@@ -174,6 +190,7 @@ CONFIG_HZ_100=y 
# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=100

# CONFIG_SCHED_HRTICK is not set

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set
@@ -181,7 +198,10 @@ CONFIG_BINFMT_ELF=y 
# CONFIG_BINFMT_MISC is not set

# CONFIG_MATH_EMULATION is not set

CONFIG_8XX_MINIMAL_FPEMU=y

# CONFIG_IOMMU_HELPER is not set

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_HAS_WALK_MEMORY=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_POPULATES_NODE_MAP=y

CONFIG_SELECT_MEMORY_MODEL=y
@@ -200,11 +220,7 @@ CONFIG_VIRT_TO_BUS=y 
CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set

# CONFIG_PM is not set

CONFIG_SUSPEND_UP_POSSIBLE=y

CONFIG_HIBERNATION_UP_POSSIBLE=y

# CONFIG_SECCOMP is not set

CONFIG_WANT_DEVICE_TREE=y

CONFIG_DEVICE_TREE="ep88xc.dts"

CONFIG_ISA_DMA_API=y



#
@@ -301,6 +317,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set
@@ -407,6 +424,7 @@ CONFIG_OF_DEVICE=y 
# CONFIG_PARPORT is not set

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set



#
@@ -441,6 +459,7 @@ CONFIG_LXT_PHY=y 
# CONFIG_SMSC_PHY is not set

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y
@@ -465,7 +484,6 @@ CONFIG_FS_ENET_MDIO_FEC=y 
# CONFIG_WAN 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
@@ -528,6 +546,7 @@ CONFIG_GEN_RTC=y 
# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_WATCHDOG is not set



#
@@ -567,9 +586,11 @@ CONFIG_DAB=y 
# CONFIG_SOUND is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_EDAC is not set

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set



#

# Userspace I/O
@@ -588,11 +609,9 @@ CONFIG_DAB=y 
# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY is not set

# CONFIG_QUOTA is not set

# CONFIG_DNOTIFY is not set

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set
@@ -635,8 +654,10 @@ CONFIG_TMPFS=y 
# CONFIG_JFFS2_FS is not set

CONFIG_CRAMFS=y

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y
@@ -683,7 +704,6 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_SYSV68_PARTITION is not set

# CONFIG_NLS is not set

# CONFIG_DLM is not set

# CONFIG_UCC_SLOW is not set



#

# Library routines
@@ -698,7 +718,6 @@ CONFIG_ZLIB_INFLATE=y 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

# CONFIG_INSTRUMENTATION is not set



#

# Kernel hacking
@@ -717,6 +736,7 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -727,8 +747,8 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

CONFIG_FORCED_INLINING=y

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_SAMPLES is not set

# CONFIG_DEBUG_STACKOVERFLOW is not set

arch/powerpc/configs/linkstation_defconfig

+86 −45

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/mpc7448_hpc2_defconfig

+94 −25
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.24-rc4

# Thu Dec  6 16:48:28 2007

# Linux kernel version: 2.6.25-rc6

# Mon Mar 24 08:48:11 2008

#

# CONFIG_PPC64 is not set
@@ -29,6 +29,7 @@ CONFIG_GENERIC_TIME=y 
CONFIG_GENERIC_TIME_VSYSCALL=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_HARDIRQS=y

# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set

CONFIG_IRQ_PER_CPU=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_ARCH_HAS_ILOG2_U32=y
@@ -66,15 +67,19 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_POSIX_MQUEUE is not set

# 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

# CONFIG_CGROUPS is not set

CONFIG_GROUP_SCHED=y

# CONFIG_FAIR_GROUP_SCHED is not set

# CONFIG_RT_GROUP_SCHED is not set

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -87,11 +92,13 @@ CONFIG_HOTPLUG=y 
CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y
@@ -99,6 +106,13 @@ CONFIG_SLUB_DEBUG=y 
# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0
@@ -121,6 +135,7 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y



#

# Platform support
@@ -131,20 +146,22 @@ CONFIG_PPC_MULTIPLATFORM=y 
# CONFIG_PPC_86xx is not set

CONFIG_CLASSIC32=y

# CONFIG_PPC_CHRP is not set

# CONFIG_PPC_MPC512x is not set

# CONFIG_PPC_MPC5121 is not set

# CONFIG_MPC5121_ADS is not set

# CONFIG_PPC_MPC52xx is not set

# CONFIG_PPC_MPC5200 is not set

# CONFIG_PPC_EFIKA is not set

# CONFIG_PPC_LITE5200 is not set

# CONFIG_PPC_PMAC is not set

# CONFIG_PPC_CELL is not set

# CONFIG_PPC_CELL_NATIVE is not set

# CONFIG_PQ2ADS is not set

CONFIG_EMBEDDED6xx=y

# CONFIG_LINKSTATION is not set

# CONFIG_STORCENTER is not set

CONFIG_MPC7448HPC2=y

# CONFIG_PPC_HOLLY is not set

# CONFIG_PPC_PRPMC2800 is not set

CONFIG_TSI108_BRIDGE=y

# CONFIG_IPIC is not set

CONFIG_MPIC=y

CONFIG_MPIC_WEIRD=y

# CONFIG_PPC_I8259 is not set
@@ -156,7 +173,6 @@ CONFIG_MPIC_WEIRD=y 
# CONFIG_GENERIC_IOMAP is not set

# CONFIG_CPU_FREQ is not set

# CONFIG_TAU is not set

# CONFIG_CPM2 is not set

# CONFIG_FSL_ULI1575 is not set



#
@@ -172,12 +188,16 @@ CONFIG_HZ_250=y 
# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

# CONFIG_SCHED_HRTICK is not set

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=y

# CONFIG_IOMMU_HELPER is not set

CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_ARCH_HAS_WALK_MEMORY=y

CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

# CONFIG_KEXEC is not set

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -197,11 +217,7 @@ CONFIG_VIRT_TO_BUS=y 
CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set

# CONFIG_PM is not set

CONFIG_SUSPEND_UP_POSSIBLE=y

CONFIG_HIBERNATION_UP_POSSIBLE=y

# CONFIG_SECCOMP is not set

CONFIG_WANT_DEVICE_TREE=y

CONFIG_DEVICE_TREE=""

CONFIG_ISA_DMA_API=y



#
@@ -249,6 +265,7 @@ CONFIG_XFRM=y 
CONFIG_XFRM_USER=y

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_XFRM_STATISTICS is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

CONFIG_IP_MULTICAST=y
@@ -304,6 +321,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set
@@ -348,7 +366,7 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=16

CONFIG_BLK_DEV_RAM_SIZE=131072

CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024

# CONFIG_BLK_DEV_XIP is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

CONFIG_MISC_DEVICES=y
@@ -356,6 +374,8 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_EEPROM_93CX6 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ENCLOSURE_SERVICES is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set



#
@@ -419,6 +439,7 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_IPS is not set

# CONFIG_SCSI_INITIO is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_MVSAS is not set

# CONFIG_SCSI_STEX is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set
@@ -472,6 +493,7 @@ CONFIG_SATA_MV=y 
# CONFIG_PATA_MPIIX is not set

# CONFIG_PATA_OLDPIIX is not set

# CONFIG_PATA_NETCELL is not set

# CONFIG_PATA_NINJA32 is not set

# CONFIG_PATA_NS87410 is not set

# CONFIG_PATA_NS87415 is not set

# CONFIG_PATA_OPTI is not set
@@ -505,7 +527,6 @@ CONFIG_NETDEVICES=y 
# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_IP1000 is not set

# CONFIG_ARCNET is not set

CONFIG_PHYLIB=y
@@ -521,6 +542,7 @@ CONFIG_PHYLIB=y 
# CONFIG_SMSC_PHY is not set

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_FIXED_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y
@@ -552,6 +574,7 @@ CONFIG_8139TOO=y 
# CONFIG_8139TOO_TUNE_TWISTER is not set

# CONFIG_8139TOO_8129 is not set

# CONFIG_8139_OLD_RX_RESET is not set

# CONFIG_R6040 is not set

# CONFIG_SIS900 is not set

# CONFIG_EPIC100 is not set

# CONFIG_SUNDANCE is not set
@@ -563,6 +586,9 @@ CONFIG_NETDEV_1000=y 
# CONFIG_DL2K is not set

# CONFIG_E1000 is not set

# CONFIG_E1000E is not set

# CONFIG_E1000E_ENABLED is not set

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -589,6 +615,7 @@ CONFIG_NETDEV_10000=y 
# CONFIG_NIU is not set

# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_TR is not set



#
@@ -602,7 +629,6 @@ CONFIG_NETDEV_10000=y 
# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_NET_FC 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
@@ -645,6 +671,7 @@ CONFIG_INPUT=y 
#

# CONFIG_VT is not set

# CONFIG_SERIAL_NONSTANDARD is not set

# CONFIG_NOZOMI is not set



#

# Serial drivers
@@ -703,6 +730,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

# CONFIG_THERMAL is not set

# CONFIG_WATCHDOG is not set



#
@@ -755,16 +783,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# USB Gadget Support

#

# CONFIG_USB_GADGET is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_INFINIBAND is not set

# CONFIG_EDAC is not set

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set



#

# Userspace I/O
@@ -790,12 +816,10 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set
@@ -837,8 +861,10 @@ CONFIG_TMPFS=y 
# CONFIG_EFS_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y
@@ -883,7 +909,6 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_SYSV68_PARTITION is not set

# CONFIG_NLS is not set

# CONFIG_DLM is not set

# CONFIG_UCC_SLOW is not set



#

# Library routines
@@ -899,7 +924,6 @@ CONFIG_PLIST=y 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

# CONFIG_INSTRUMENTATION is not set



#

# Kernel hacking
@@ -913,6 +937,7 @@ CONFIG_ENABLE_MUST_CHECK=y 
# CONFIG_HEADERS_CHECK is not set

# CONFIG_DEBUG_KERNEL is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_SAMPLES is not set

# CONFIG_BOOTX_TEXT is not set
@@ -924,5 +949,49 @@ CONFIG_ENABLE_MUST_CHECK=y 
# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

# CONFIG_CRYPTO is not set

CONFIG_CRYPTO=y

# CONFIG_CRYPTO_SEQIV is not set

# CONFIG_CRYPTO_MANAGER is not set

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

# CONFIG_CRYPTO_MD5 is not set

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_ECB is not set

# CONFIG_CRYPTO_CBC is not set

# CONFIG_CRYPTO_PCBC is not set

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CTR is not set

# CONFIG_CRYPTO_GCM is not set

# CONFIG_CRYPTO_CCM is not set

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_DES is not set

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_SALSA20 is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_LZO is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set

# CONFIG_PPC_CLOCK is not set