Merge commit 'gcl/merge' into merge (78924577) · Commits · e / devices / android_kernel_fairphone_FP4

arch/powerpc/boot/wrapper

+5 −2

Original line number	Diff line number	Diff line
		@@ -43,6 +43,9 @@ gzip=.gz
		# cross-compilation prefix
		CROSS=

		# mkimage wrapper script
		MKIMAGE=$srctree/scripts/mkuboot.sh

		# directory for object and other files used by this script
		object=arch/powerpc/boot
		objbin=$object
		@@ -267,7 +270,7 @@ membase=`${CROSS}objdump -p "$kernel" \| grep -m 1 LOAD \| awk '{print $7}'`
		case "$platform" in
		uboot)
		rm -f "$ofile"
		mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
		${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
		$uboot_version -d "$vmz" "$ofile"
		if [ -z "$cacheit" ]; then
		rm -f "$vmz"
		@@ -327,7 +330,7 @@ coff)
		;;
		cuboot*)
		gzip -f -9 "$ofile"
		mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
		${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
		$uboot_version -d "$ofile".gz "$ofile"
		;;
		treeboot*)

arch/powerpc/configs/52xx/cm5200_defconfig

+61 −14

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.32-rc4
		# Thu Oct 15 10:33:22 2009
		# Linux kernel version: 2.6.33-rc2
		# Wed Dec 30 14:45:07 2009
		#
		# CONFIG_PPC64 is not set

		@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
		# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
		# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
		CONFIG_IRQ_PER_CPU=y
		CONFIG_NR_IRQS=512
		CONFIG_STACKTRACE_SUPPORT=y
		CONFIG_HAVE_LATENCYTOP_SUPPORT=y
		CONFIG_TRACE_IRQFLAGS_SUPPORT=y
		@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
		CONFIG_GENERIC_BUG=y
		CONFIG_DTC=y
		CONFIG_DEFAULT_UIMAGE=y
		CONFIG_ARCH_HIBERNATION_POSSIBLE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
		@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
		#
		CONFIG_TREE_RCU=y
		# CONFIG_TREE_PREEMPT_RCU is not set
		# CONFIG_TINY_RCU is not set
		# CONFIG_RCU_TRACE is not set
		CONFIG_RCU_FANOUT=32
		# CONFIG_RCU_FANOUT_EXACT is not set
		@@ -166,14 +169,41 @@ CONFIG_LBDAF=y
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		CONFIG_DEFAULT_CFQ=y
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"
		CONFIG_DEFAULT_IOSCHED="cfq"
		# CONFIG_INLINE_SPIN_TRYLOCK is not set
		# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK is not set
		# CONFIG_INLINE_SPIN_LOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
		CONFIG_INLINE_SPIN_UNLOCK=y
		# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
		CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
		# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_READ_TRYLOCK is not set
		# CONFIG_INLINE_READ_LOCK is not set
		# CONFIG_INLINE_READ_LOCK_BH is not set
		# CONFIG_INLINE_READ_LOCK_IRQ is not set
		# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
		CONFIG_INLINE_READ_UNLOCK=y
		# CONFIG_INLINE_READ_UNLOCK_BH is not set
		CONFIG_INLINE_READ_UNLOCK_IRQ=y
		# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_WRITE_TRYLOCK is not set
		# CONFIG_INLINE_WRITE_LOCK is not set
		# CONFIG_INLINE_WRITE_LOCK_BH is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
		CONFIG_INLINE_WRITE_UNLOCK=y
		# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
		CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
		# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
		# CONFIG_MUTEX_SPIN_ON_OWNER is not set
		# CONFIG_FREEZER is not set

		#
		@@ -189,6 +219,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
		# CONFIG_PPC_MEDIA5200 is not set
		# CONFIG_PPC_MPC5200_BUGFIX is not set
		# CONFIG_PPC_MPC5200_GPIO is not set
		# CONFIG_PPC_MPC5200_LPBFIFO is not set
		# CONFIG_PPC_PMAC is not set
		# CONFIG_PPC_CELL is not set
		# CONFIG_PPC_CELL_NATIVE is not set
		@@ -243,6 +274,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
		CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
		# CONFIG_KEXEC is not set
		# CONFIG_CRASH_DUMP is not set
		CONFIG_SPARSE_IRQ=y
		CONFIG_MAX_ACTIVE_REGIONS=32
		CONFIG_ARCH_FLATMEM_ENABLE=y
		CONFIG_ARCH_POPULATES_NODE_MAP=y
		@@ -259,8 +291,6 @@ CONFIG_MIGRATION=y
		CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		# CONFIG_KSM is not set
		CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
		CONFIG_PPC_4K_PAGES=y
		@@ -273,6 +303,7 @@ CONFIG_PROC_DEVICETREE=y
		CONFIG_EXTRA_TARGETS=""
		CONFIG_PM=y
		# CONFIG_PM_DEBUG is not set
		# CONFIG_HIBERNATION is not set
		# CONFIG_PM_RUNTIME is not set
		CONFIG_SECCOMP=y
		CONFIG_ISA_DMA_API=y
		@@ -378,7 +409,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		# CONFIG_AF_RXRPC is not set
		# CONFIG_WIRELESS is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		# CONFIG_LIB80211 is not set

		#
		# CFG80211 needs to be enabled for MAC80211
		#
		# CONFIG_WIMAX is not set
		# CONFIG_RFKILL is not set
		# CONFIG_NET_9P is not set
		@@ -489,6 +526,10 @@ CONFIG_BLK_DEV=y
		# CONFIG_BLK_DEV_COW_COMMON is not set
		CONFIG_BLK_DEV_LOOP=y
		# CONFIG_BLK_DEV_CRYPTOLOOP is not set

		#
		# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
		#
		# CONFIG_BLK_DEV_NBD is not set
		# CONFIG_BLK_DEV_UB is not set
		CONFIG_BLK_DEV_RAM=y
		@@ -587,8 +628,8 @@ CONFIG_FEC_MPC52xx_MDIO=y
		# CONFIG_NETDEV_1000 is not set
		# CONFIG_NETDEV_10000 is not set
		CONFIG_WLAN=y
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_USB_ZD1201 is not set
		# CONFIG_HOSTAP is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -643,6 +684,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
		CONFIG_SERIAL_MPC52xx=y
		CONFIG_SERIAL_MPC52xx_CONSOLE=y
		CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=57600
		# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
		CONFIG_LEGACY_PTYS=y
		@@ -688,7 +730,6 @@ CONFIG_I2C_MPC=y
		#
		# Miscellaneous I2C Chip support
		#
		# CONFIG_DS1682 is not set
		# CONFIG_SENSORS_TSL2550 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		@@ -735,11 +776,13 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_TWL4030_CORE is not set
		# CONFIG_MFD_TMIO is not set
		# CONFIG_PMIC_DA903X is not set
		# CONFIG_PMIC_ADP5520 is not set
		# CONFIG_MFD_WM8400 is not set
		# CONFIG_MFD_WM831X is not set
		# CONFIG_MFD_WM8350_I2C is not set
		# CONFIG_MFD_PCF50633 is not set
		# CONFIG_AB3100_CORE is not set
		# CONFIG_MFD_88PM8607 is not set
		# CONFIG_REGULATOR is not set
		# CONFIG_MEDIA_SUPPORT is not set

		@@ -797,7 +840,6 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
		# CONFIG_USB_SL811_HCD is not set
		# CONFIG_USB_R8A66597_HCD is not set
		# CONFIG_USB_HWA_HCD is not set
		# CONFIG_USB_MUSB_HDRC is not set

		#
		# USB Device Class drivers
		@@ -1137,6 +1179,7 @@ CONFIG_SCHED_DEBUG=y
		# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
		# CONFIG_FAULT_INJECTION is not set
		# CONFIG_LATENCYTOP is not set
		# CONFIG_SYSCTL_SYSCALL_CHECK is not set
		# CONFIG_DEBUG_PAGEALLOC is not set
		CONFIG_HAVE_FUNCTION_TRACER=y
		CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
		@@ -1180,7 +1223,11 @@ CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_KEYS is not set
		# CONFIG_SECURITY is not set
		# CONFIG_SECURITYFS is not set
		# CONFIG_SECURITY_FILE_CAPABILITIES is not set
		# CONFIG_DEFAULT_SECURITY_SELINUX is not set
		# CONFIG_DEFAULT_SECURITY_SMACK is not set
		# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
		CONFIG_DEFAULT_SECURITY_DAC=y
		CONFIG_DEFAULT_SECURITY=""
		CONFIG_CRYPTO=y

		#

arch/powerpc/configs/52xx/lite5200b_defconfig

+71 −19

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.32-rc4
		# Thu Oct 15 10:33:24 2009
		# Linux kernel version: 2.6.33-rc2
		# Wed Dec 30 14:45:09 2009
		#
		# CONFIG_PPC64 is not set

		@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
		# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
		# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
		CONFIG_IRQ_PER_CPU=y
		CONFIG_NR_IRQS=512
		CONFIG_STACKTRACE_SUPPORT=y
		CONFIG_HAVE_LATENCYTOP_SUPPORT=y
		CONFIG_TRACE_IRQFLAGS_SUPPORT=y
		@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
		CONFIG_GENERIC_BUG=y
		CONFIG_DTC=y
		CONFIG_DEFAULT_UIMAGE=y
		CONFIG_ARCH_HIBERNATION_POSSIBLE=y
		CONFIG_ARCH_SUSPEND_POSSIBLE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		@@ -86,6 +88,7 @@ CONFIG_SYSVIPC_SYSCTL=y
		#
		CONFIG_TREE_RCU=y
		# CONFIG_TREE_PREEMPT_RCU is not set
		# CONFIG_TINY_RCU is not set
		# CONFIG_RCU_TRACE is not set
		CONFIG_RCU_FANOUT=32
		# CONFIG_RCU_FANOUT_EXACT is not set
		@@ -173,14 +176,41 @@ CONFIG_LBDAF=y
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		CONFIG_DEFAULT_CFQ=y
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"
		CONFIG_DEFAULT_IOSCHED="cfq"
		# CONFIG_INLINE_SPIN_TRYLOCK is not set
		# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK is not set
		# CONFIG_INLINE_SPIN_LOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
		CONFIG_INLINE_SPIN_UNLOCK=y
		# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
		CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
		# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_READ_TRYLOCK is not set
		# CONFIG_INLINE_READ_LOCK is not set
		# CONFIG_INLINE_READ_LOCK_BH is not set
		# CONFIG_INLINE_READ_LOCK_IRQ is not set
		# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
		CONFIG_INLINE_READ_UNLOCK=y
		# CONFIG_INLINE_READ_UNLOCK_BH is not set
		CONFIG_INLINE_READ_UNLOCK_IRQ=y
		# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_WRITE_TRYLOCK is not set
		# CONFIG_INLINE_WRITE_LOCK is not set
		# CONFIG_INLINE_WRITE_LOCK_BH is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
		CONFIG_INLINE_WRITE_UNLOCK=y
		# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
		CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
		# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
		# CONFIG_MUTEX_SPIN_ON_OWNER is not set
		CONFIG_FREEZER=y

		#
		@@ -196,6 +226,7 @@ CONFIG_PPC_LITE5200=y
		# CONFIG_PPC_MEDIA5200 is not set
		# CONFIG_PPC_MPC5200_BUGFIX is not set
		# CONFIG_PPC_MPC5200_GPIO is not set
		# CONFIG_PPC_MPC5200_LPBFIFO is not set
		# CONFIG_PPC_PMAC is not set
		# CONFIG_PPC_CELL is not set
		# CONFIG_PPC_CELL_NATIVE is not set
		@@ -252,6 +283,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
		CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
		# CONFIG_KEXEC is not set
		# CONFIG_CRASH_DUMP is not set
		CONFIG_SPARSE_IRQ=y
		CONFIG_MAX_ACTIVE_REGIONS=32
		CONFIG_ARCH_FLATMEM_ENABLE=y
		CONFIG_ARCH_POPULATES_NODE_MAP=y
		@@ -268,8 +300,6 @@ CONFIG_MIGRATION=y
		CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		# CONFIG_KSM is not set
		CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
		CONFIG_PPC_4K_PAGES=y
		@@ -285,6 +315,7 @@ CONFIG_PM=y
		CONFIG_PM_SLEEP=y
		CONFIG_SUSPEND=y
		CONFIG_SUSPEND_FREEZER=y
		# CONFIG_HIBERNATION is not set
		# CONFIG_PM_RUNTIME is not set
		CONFIG_SECCOMP=y
		CONFIG_ISA_DMA_API=y
		@@ -398,7 +429,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		# CONFIG_AF_RXRPC is not set
		# CONFIG_WIRELESS is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		# CONFIG_LIB80211 is not set

		#
		# CFG80211 needs to be enabled for MAC80211
		#
		# CONFIG_WIMAX is not set
		# CONFIG_RFKILL is not set
		# CONFIG_NET_9P is not set
		@@ -433,6 +470,10 @@ CONFIG_BLK_DEV=y
		# CONFIG_BLK_DEV_COW_COMMON is not set
		CONFIG_BLK_DEV_LOOP=y
		# CONFIG_BLK_DEV_CRYPTOLOOP is not set

		#
		# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
		#
		# CONFIG_BLK_DEV_NBD is not set
		# CONFIG_BLK_DEV_SX8 is not set
		CONFIG_BLK_DEV_RAM=y
		@@ -443,6 +484,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
		# CONFIG_ATA_OVER_ETH is not set
		# CONFIG_BLK_DEV_HD is not set
		CONFIG_MISC_DEVICES=y
		# CONFIG_AD525X_DPOT is not set
		# CONFIG_PHANTOM is not set
		# CONFIG_SGI_IOC4 is not set
		# CONFIG_TIFM_CORE is not set
		@@ -450,6 +492,7 @@ CONFIG_MISC_DEVICES=y
		# CONFIG_ENCLOSURE_SERVICES is not set
		# CONFIG_HP_ILO is not set
		# CONFIG_ISL29003 is not set
		# CONFIG_DS1682 is not set
		# CONFIG_C2PORT is not set

		#
		@@ -502,7 +545,9 @@ CONFIG_SCSI_LOWLEVEL=y
		# CONFIG_SCSI_BNX2_ISCSI is not set
		# CONFIG_BE2ISCSI is not set
		# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
		# CONFIG_SCSI_HPSA is not set
		# CONFIG_SCSI_3W_9XXX is not set
		# CONFIG_SCSI_3W_SAS is not set
		# CONFIG_SCSI_ACARD is not set
		# CONFIG_SCSI_AACRAID is not set
		# CONFIG_SCSI_AIC7XXX is not set
		@@ -541,6 +586,7 @@ CONFIG_SCSI_LOWLEVEL=y
		# CONFIG_SCSI_NSP32 is not set
		# CONFIG_SCSI_DEBUG is not set
		# CONFIG_SCSI_PMCRAID is not set
		# CONFIG_SCSI_PM8001 is not set
		# CONFIG_SCSI_SRP is not set
		# CONFIG_SCSI_BFA_FC is not set
		# CONFIG_SCSI_DH is not set
		@@ -596,15 +642,16 @@ CONFIG_PATA_MPC52xx=y
		# CONFIG_PATA_NS87415 is not set
		# CONFIG_PATA_OPTI is not set
		# CONFIG_PATA_OPTIDMA is not set
		# CONFIG_PATA_PDC2027X is not set
		# CONFIG_PATA_PDC_OLD is not set
		# CONFIG_PATA_RADISYS is not set
		# CONFIG_PATA_RDC is not set
		# CONFIG_PATA_RZ1000 is not set
		# CONFIG_PATA_SC1200 is not set
		# CONFIG_PATA_SERVERWORKS is not set
		# CONFIG_PATA_PDC2027X is not set
		# CONFIG_PATA_SIL680 is not set
		# CONFIG_PATA_SIS is not set
		# CONFIG_PATA_TOSHIBA is not set
		# CONFIG_PATA_VIA is not set
		# CONFIG_PATA_WINBOND is not set
		# CONFIG_PATA_PLATFORM is not set
		@@ -726,8 +773,10 @@ CONFIG_CHELSIO_T3_DEPENDS=y
		# CONFIG_BE2NET is not set
		# CONFIG_TR is not set
		CONFIG_WLAN=y
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_AIRO is not set
		# CONFIG_ATMEL is not set
		# CONFIG_PRISM54 is not set
		# CONFIG_HOSTAP is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -741,6 +790,7 @@ CONFIG_WLAN=y
		# CONFIG_NETCONSOLE is not set
		# CONFIG_NETPOLL is not set
		# CONFIG_NET_POLL_CONTROLLER is not set
		# CONFIG_VMXNET3 is not set
		# CONFIG_ISDN is not set
		# CONFIG_PHONE is not set

		@@ -778,6 +828,7 @@ CONFIG_SERIAL_MPC52xx=y
		CONFIG_SERIAL_MPC52xx_CONSOLE=y
		CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
		# CONFIG_SERIAL_JSM is not set
		# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
		CONFIG_LEGACY_PTYS=y
		@@ -835,11 +886,6 @@ CONFIG_I2C_MPC=y
		# CONFIG_I2C_PARPORT_LIGHT is not set
		# CONFIG_I2C_TAOS_EVM is not set

		#
		# Graphics adapter I2C/DDC channel drivers
		#
		# CONFIG_I2C_VOODOO3 is not set

		#
		# Other I2C/SMBus bus drivers
		#
		@@ -849,7 +895,6 @@ CONFIG_I2C_MPC=y
		#
		# Miscellaneous I2C Chip support
		#
		# CONFIG_DS1682 is not set
		# CONFIG_SENSORS_TSL2550 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		@@ -884,11 +929,13 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_TWL4030_CORE is not set
		# CONFIG_MFD_TMIO is not set
		# CONFIG_PMIC_DA903X is not set
		# CONFIG_PMIC_ADP5520 is not set
		# CONFIG_MFD_WM8400 is not set
		# CONFIG_MFD_WM831X is not set
		# CONFIG_MFD_WM8350_I2C is not set
		# CONFIG_MFD_PCF50633 is not set
		# CONFIG_AB3100_CORE is not set
		# CONFIG_MFD_88PM8607 is not set
		# CONFIG_REGULATOR is not set
		# CONFIG_MEDIA_SUPPORT is not set

		@@ -1129,6 +1176,7 @@ CONFIG_DEBUG_INFO=y
		# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
		# CONFIG_FAULT_INJECTION is not set
		# CONFIG_LATENCYTOP is not set
		# CONFIG_SYSCTL_SYSCALL_CHECK is not set
		# CONFIG_DEBUG_PAGEALLOC is not set
		CONFIG_HAVE_FUNCTION_TRACER=y
		CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
		@@ -1172,7 +1220,11 @@ CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_KEYS is not set
		# CONFIG_SECURITY is not set
		# CONFIG_SECURITYFS is not set
		# CONFIG_SECURITY_FILE_CAPABILITIES is not set
		# CONFIG_DEFAULT_SECURITY_SELINUX is not set
		# CONFIG_DEFAULT_SECURITY_SMACK is not set
		# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
		CONFIG_DEFAULT_SECURITY_DAC=y
		CONFIG_DEFAULT_SECURITY=""
		CONFIG_CRYPTO=y

		#

arch/powerpc/configs/52xx/motionpro_defconfig

+66 −13

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.32-rc4
		# Thu Oct 15 10:33:22 2009
		# Linux kernel version: 2.6.33-rc2
		# Wed Dec 30 14:45:08 2009
		#
		# CONFIG_PPC64 is not set

		@@ -36,6 +36,7 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
		# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
		# CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set
		CONFIG_IRQ_PER_CPU=y
		CONFIG_NR_IRQS=512
		CONFIG_STACKTRACE_SUPPORT=y
		CONFIG_HAVE_LATENCYTOP_SUPPORT=y
		CONFIG_TRACE_IRQFLAGS_SUPPORT=y
		@@ -58,6 +59,7 @@ CONFIG_AUDIT_ARCH=y
		CONFIG_GENERIC_BUG=y
		CONFIG_DTC=y
		CONFIG_DEFAULT_UIMAGE=y
		CONFIG_ARCH_HIBERNATION_POSSIBLE=y
		# CONFIG_PPC_DCR_NATIVE is not set
		# CONFIG_PPC_DCR_MMIO is not set
		CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
		@@ -85,6 +87,7 @@ CONFIG_SYSVIPC_SYSCTL=y
		#
		CONFIG_TREE_RCU=y
		# CONFIG_TREE_PREEMPT_RCU is not set
		# CONFIG_TINY_RCU is not set
		# CONFIG_RCU_TRACE is not set
		CONFIG_RCU_FANOUT=32
		# CONFIG_RCU_FANOUT_EXACT is not set
		@@ -166,14 +169,41 @@ CONFIG_LBDAF=y
		# IO Schedulers
		#
		CONFIG_IOSCHED_NOOP=y
		CONFIG_IOSCHED_AS=y
		CONFIG_IOSCHED_DEADLINE=y
		CONFIG_IOSCHED_CFQ=y
		CONFIG_DEFAULT_AS=y
		# CONFIG_DEFAULT_DEADLINE is not set
		# CONFIG_DEFAULT_CFQ is not set
		CONFIG_DEFAULT_CFQ=y
		# CONFIG_DEFAULT_NOOP is not set
		CONFIG_DEFAULT_IOSCHED="anticipatory"
		CONFIG_DEFAULT_IOSCHED="cfq"
		# CONFIG_INLINE_SPIN_TRYLOCK is not set
		# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK is not set
		# CONFIG_INLINE_SPIN_LOCK_BH is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
		# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
		CONFIG_INLINE_SPIN_UNLOCK=y
		# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
		CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
		# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_READ_TRYLOCK is not set
		# CONFIG_INLINE_READ_LOCK is not set
		# CONFIG_INLINE_READ_LOCK_BH is not set
		# CONFIG_INLINE_READ_LOCK_IRQ is not set
		# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
		CONFIG_INLINE_READ_UNLOCK=y
		# CONFIG_INLINE_READ_UNLOCK_BH is not set
		CONFIG_INLINE_READ_UNLOCK_IRQ=y
		# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
		# CONFIG_INLINE_WRITE_TRYLOCK is not set
		# CONFIG_INLINE_WRITE_LOCK is not set
		# CONFIG_INLINE_WRITE_LOCK_BH is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
		# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
		CONFIG_INLINE_WRITE_UNLOCK=y
		# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
		CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
		# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
		# CONFIG_MUTEX_SPIN_ON_OWNER is not set
		# CONFIG_FREEZER is not set

		#
		@@ -189,6 +219,7 @@ CONFIG_PPC_MPC5200_SIMPLE=y
		# CONFIG_PPC_MEDIA5200 is not set
		# CONFIG_PPC_MPC5200_BUGFIX is not set
		# CONFIG_PPC_MPC5200_GPIO is not set
		# CONFIG_PPC_MPC5200_LPBFIFO is not set
		# CONFIG_PPC_PMAC is not set
		# CONFIG_PPC_CELL is not set
		# CONFIG_PPC_CELL_NATIVE is not set
		@@ -244,6 +275,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
		CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
		# CONFIG_KEXEC is not set
		# CONFIG_CRASH_DUMP is not set
		CONFIG_SPARSE_IRQ=y
		CONFIG_MAX_ACTIVE_REGIONS=32
		CONFIG_ARCH_FLATMEM_ENABLE=y
		CONFIG_ARCH_POPULATES_NODE_MAP=y
		@@ -260,8 +292,6 @@ CONFIG_MIGRATION=y
		CONFIG_ZONE_DMA_FLAG=1
		CONFIG_BOUNCE=y
		CONFIG_VIRT_TO_BUS=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		# CONFIG_KSM is not set
		CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
		CONFIG_PPC_4K_PAGES=y
		@@ -274,6 +304,7 @@ CONFIG_PROC_DEVICETREE=y
		CONFIG_EXTRA_TARGETS=""
		CONFIG_PM=y
		# CONFIG_PM_DEBUG is not set
		# CONFIG_HIBERNATION is not set
		# CONFIG_PM_RUNTIME is not set
		CONFIG_SECCOMP=y
		CONFIG_ISA_DMA_API=y
		@@ -379,7 +410,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_IRDA is not set
		# CONFIG_BT is not set
		# CONFIG_AF_RXRPC is not set
		# CONFIG_WIRELESS is not set
		CONFIG_WIRELESS=y
		# CONFIG_CFG80211 is not set
		# CONFIG_LIB80211 is not set

		#
		# CFG80211 needs to be enabled for MAC80211
		#
		# CONFIG_WIMAX is not set
		# CONFIG_RFKILL is not set
		# CONFIG_NET_9P is not set
		@@ -490,6 +527,10 @@ CONFIG_BLK_DEV=y
		# CONFIG_BLK_DEV_COW_COMMON is not set
		CONFIG_BLK_DEV_LOOP=y
		# CONFIG_BLK_DEV_CRYPTOLOOP is not set

		#
		# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
		#
		# CONFIG_BLK_DEV_NBD is not set
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_COUNT=16
		@@ -499,9 +540,11 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
		# CONFIG_ATA_OVER_ETH is not set
		# CONFIG_BLK_DEV_HD is not set
		CONFIG_MISC_DEVICES=y
		# CONFIG_AD525X_DPOT is not set
		# CONFIG_ICS932S401 is not set
		# CONFIG_ENCLOSURE_SERVICES is not set
		# CONFIG_ISL29003 is not set
		# CONFIG_DS1682 is not set
		# CONFIG_C2PORT is not set

		#
		@@ -610,8 +653,7 @@ CONFIG_FEC_MPC52xx_MDIO=y
		# CONFIG_NETDEV_1000 is not set
		# CONFIG_NETDEV_10000 is not set
		CONFIG_WLAN=y
		# CONFIG_WLAN_PRE80211 is not set
		# CONFIG_WLAN_80211 is not set
		# CONFIG_HOSTAP is not set

		#
		# Enable WiMAX (Networking options) to see the WiMAX drivers
		@@ -657,6 +699,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
		CONFIG_SERIAL_MPC52xx=y
		CONFIG_SERIAL_MPC52xx_CONSOLE=y
		CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
		# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
		CONFIG_UNIX98_PTYS=y
		# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
		CONFIG_LEGACY_PTYS=y
		@@ -700,7 +743,6 @@ CONFIG_I2C_MPC=y
		#
		# Miscellaneous I2C Chip support
		#
		# CONFIG_DS1682 is not set
		# CONFIG_SENSORS_TSL2550 is not set
		# CONFIG_I2C_DEBUG_CORE is not set
		# CONFIG_I2C_DEBUG_ALGO is not set
		@@ -745,6 +787,7 @@ CONFIG_HWMON=y
		# CONFIG_SENSORS_GL520SM is not set
		# CONFIG_SENSORS_IT87 is not set
		# CONFIG_SENSORS_LM63 is not set
		# CONFIG_SENSORS_LM73 is not set
		# CONFIG_SENSORS_LM75 is not set
		# CONFIG_SENSORS_LM77 is not set
		# CONFIG_SENSORS_LM78 is not set
		@@ -805,11 +848,13 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_TWL4030_CORE is not set
		# CONFIG_MFD_TMIO is not set
		# CONFIG_PMIC_DA903X is not set
		# CONFIG_PMIC_ADP5520 is not set
		# CONFIG_MFD_WM8400 is not set
		# CONFIG_MFD_WM831X is not set
		# CONFIG_MFD_WM8350_I2C is not set
		# CONFIG_MFD_PCF50633 is not set
		# CONFIG_AB3100_CORE is not set
		# CONFIG_MFD_88PM8607 is not set
		# CONFIG_REGULATOR is not set
		# CONFIG_MEDIA_SUPPORT is not set

		@@ -881,6 +926,7 @@ CONFIG_RTC_DRV_DS1307=y
		# CONFIG_RTC_DRV_PCF8563 is not set
		# CONFIG_RTC_DRV_PCF8583 is not set
		# CONFIG_RTC_DRV_M41T80 is not set
		# CONFIG_RTC_DRV_BQ32K is not set
		# CONFIG_RTC_DRV_S35390A is not set
		# CONFIG_RTC_DRV_FM3130 is not set
		# CONFIG_RTC_DRV_RX8581 is not set
		@@ -902,7 +948,9 @@ CONFIG_RTC_DRV_DS1307=y
		# CONFIG_RTC_DRV_M48T86 is not set
		# CONFIG_RTC_DRV_M48T35 is not set
		# CONFIG_RTC_DRV_M48T59 is not set
		# CONFIG_RTC_DRV_MSM6242 is not set
		# CONFIG_RTC_DRV_BQ4802 is not set
		# CONFIG_RTC_DRV_RP5C01 is not set
		# CONFIG_RTC_DRV_V3020 is not set

		#
		@@ -1172,6 +1220,7 @@ CONFIG_DEBUG_INFO=y
		# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
		# CONFIG_FAULT_INJECTION is not set
		# CONFIG_LATENCYTOP is not set
		# CONFIG_SYSCTL_SYSCALL_CHECK is not set
		# CONFIG_DEBUG_PAGEALLOC is not set
		CONFIG_HAVE_FUNCTION_TRACER=y
		CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
		@@ -1215,7 +1264,11 @@ CONFIG_PRINT_STACK_DEPTH=64
		# CONFIG_KEYS is not set
		# CONFIG_SECURITY is not set
		# CONFIG_SECURITYFS is not set
		# CONFIG_SECURITY_FILE_CAPABILITIES is not set
		# CONFIG_DEFAULT_SECURITY_SELINUX is not set
		# CONFIG_DEFAULT_SECURITY_SMACK is not set
		# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
		CONFIG_DEFAULT_SECURITY_DAC=y
		CONFIG_DEFAULT_SECURITY=""
		CONFIG_CRYPTO=y

		#

arch/powerpc/configs/52xx/pcm030_defconfig

+64 −19

File changed.

Preview size limit exceeded, changes collapsed.