Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a07e387a authored by Josh Boyer's avatar Josh Boyer
Browse files

[POWERPC] 4xx: Add Canyonlands and Yosemite to multi-board defconfig 



Include the newly added Canyonlands and Yosemite ports in the mutli-board
440 defconfig.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent d0c8df6e

arch/powerpc/configs/ppc44x_defconfig

+10 −4
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.25-rc2

# Linux kernel version: 2.6.25-rc6

# Fri Feb 15 21:57:35 2008

# Sat Apr  5 09:35:48 2008

#

#

# CONFIG_PPC64 is not set

# CONFIG_PPC64 is not set
@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y 
CONFIG_USER_SCHED=y

CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_RELAY is not set

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_INITRD=y
@@ -113,6 +114,7 @@ CONFIG_SLUB=y 
CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

# CONFIG_KPROBES is not set

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SLABINFO=y

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

CONFIG_RT_MUTEXES=y
@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_NOOP is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

CONFIG_CLASSIC_RCU=y

# CONFIG_PREEMPT_RCU is not set

CONFIG_PPC4xx_PCI_EXPRESS=y

CONFIG_PPC4xx_PCI_EXPRESS=y





#

#
@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y 
CONFIG_KATMAI=y

CONFIG_KATMAI=y

CONFIG_RAINIER=y

CONFIG_RAINIER=y

CONFIG_WARP=y

CONFIG_WARP=y

CONFIG_CANYONLANDS=y

CONFIG_YOSEMITE=y

CONFIG_440EP=y

CONFIG_440EP=y

CONFIG_440EPX=y

CONFIG_440EPX=y

CONFIG_440GRX=y

CONFIG_440GRX=y

CONFIG_440GP=y

CONFIG_440GP=y

CONFIG_440GX=y

CONFIG_440GX=y

CONFIG_440SPe=y

CONFIG_440SPe=y

CONFIG_460EX=y

CONFIG_IBM440EP_ERR42=y

CONFIG_IBM440EP_ERR42=y

# CONFIG_IPIC is not set

# CONFIG_IPIC is not set

# CONFIG_MPIC is not set

# CONFIG_MPIC is not set
@@ -199,7 +203,6 @@ CONFIG_HZ=250 
CONFIG_PREEMPT_NONE=y

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT is not set

# CONFIG_RCU_TRACE is not set

CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

# CONFIG_BINFMT_MISC is not set

CONFIG_MATH_EMULATION=y

CONFIG_MATH_EMULATION=y
@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y 
#

#

CONFIG_ZONE_DMA=y

CONFIG_ZONE_DMA=y

CONFIG_PPC_INDIRECT_PCI=y

CONFIG_PPC_INDIRECT_PCI=y

CONFIG_4xx_SOC=y

CONFIG_PCI=y

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

CONFIG_PCI_DOMAINS=y

CONFIG_PCI_SYSCALL=y

CONFIG_PCI_SYSCALL=y
@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y 
# CONFIG_INFINIBAND is not set

# CONFIG_INFINIBAND is not set

# CONFIG_EDAC is not set

# CONFIG_EDAC is not set

# CONFIG_RTC_CLASS is not set

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set





#

#

# Userspace I/O

# Userspace I/O
@@ -805,6 +810,7 @@ CONFIG_PLIST=y 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_HAS_DMA=y

CONFIG_HAVE_LMB=y





#

#

# Kernel hacking

# Kernel hacking