aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-09-21 06:49:21 -0400
committerAnatolij Gustschin <agust@denx.de>2011-09-22 18:20:07 -0400
commit7b72c9f8750e32b3b08fab1bfef43350866ae8d1 (patch)
tree4da2429845fe3efcc842ad118bfec4475f4ff26a /arch/powerpc
parentc68308dd50c3827a4ce77a1d70e0eb2d2521cafd (diff)
powerpc: update 512x-defconfig
Activate all MPC512x related boards. Also enable GPIO-driver, SPI driver and at25 to test SPI. Enable DEVTMPFS. Bump to 3.1-rc6. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Anatolij Gustschin <agust@denx.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/configs/mpc512x_defconfig19
1 files changed, 11 insertions, 8 deletions
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig
index c02bbb2fddf8..211fcc9ed700 100644
--- a/arch/powerpc/configs/mpc512x_defconfig
+++ b/arch/powerpc/configs/mpc512x_defconfig
@@ -1,9 +1,9 @@
1CONFIG_EXPERIMENTAL=y 1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_SPARSE_IRQ=y
4CONFIG_LOG_BUF_SHIFT=16 5CONFIG_LOG_BUF_SHIFT=16
5CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7# CONFIG_COMPAT_BRK is not set 7# CONFIG_COMPAT_BRK is not set
8CONFIG_SLAB=y 8CONFIG_SLAB=y
9CONFIG_MODULES=y 9CONFIG_MODULES=y
@@ -13,10 +13,11 @@ CONFIG_MODULE_UNLOAD=y
13# CONFIG_PPC_CHRP is not set 13# CONFIG_PPC_CHRP is not set
14CONFIG_PPC_MPC512x=y 14CONFIG_PPC_MPC512x=y
15CONFIG_MPC5121_ADS=y 15CONFIG_MPC5121_ADS=y
16CONFIG_MPC5121_GENERIC=y
17CONFIG_PDM360NG=y
16# CONFIG_PPC_PMAC is not set 18# CONFIG_PPC_PMAC is not set
17CONFIG_NO_HZ=y 19CONFIG_NO_HZ=y
18CONFIG_HZ_1000=y 20CONFIG_HZ_1000=y
19CONFIG_SPARSE_IRQ=y
20# CONFIG_MIGRATION is not set 21# CONFIG_MIGRATION is not set
21# CONFIG_SECCOMP is not set 22# CONFIG_SECCOMP is not set
22# CONFIG_PCI is not set 23# CONFIG_PCI is not set
@@ -35,18 +36,16 @@ CONFIG_CAN=y
35CONFIG_CAN_RAW=y 36CONFIG_CAN_RAW=y
36CONFIG_CAN_BCM=y 37CONFIG_CAN_BCM=y
37CONFIG_CAN_VCAN=y 38CONFIG_CAN_VCAN=y
38CONFIG_CAN_DEV=y
39CONFIG_CAN_MSCAN=y 39CONFIG_CAN_MSCAN=y
40CONFIG_CAN_DEBUG_DEVICES=y 40CONFIG_CAN_DEBUG_DEVICES=y
41# CONFIG_WIRELESS is not set 41# CONFIG_WIRELESS is not set
42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 42CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
43CONFIG_DEVTMPFS=y
44CONFIG_DEVTMPFS_MOUNT=y
43# CONFIG_PREVENT_FIRMWARE_BUILD is not set 45# CONFIG_PREVENT_FIRMWARE_BUILD is not set
44# CONFIG_FIRMWARE_IN_KERNEL is not set 46# CONFIG_FIRMWARE_IN_KERNEL is not set
45CONFIG_MTD=y 47CONFIG_MTD=y
46CONFIG_MTD_CONCAT=y
47CONFIG_MTD_PARTITIONS=y
48CONFIG_MTD_CMDLINE_PARTS=y 48CONFIG_MTD_CMDLINE_PARTS=y
49CONFIG_MTD_OF_PARTS=y
50CONFIG_MTD_CHAR=y 49CONFIG_MTD_CHAR=y
51CONFIG_MTD_BLOCK=y 50CONFIG_MTD_BLOCK=y
52CONFIG_MTD_CFI=y 51CONFIG_MTD_CFI=y
@@ -63,6 +62,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
63CONFIG_BLK_DEV_XIP=y 62CONFIG_BLK_DEV_XIP=y
64CONFIG_MISC_DEVICES=y 63CONFIG_MISC_DEVICES=y
65CONFIG_EEPROM_AT24=y 64CONFIG_EEPROM_AT24=y
65CONFIG_EEPROM_AT25=y
66CONFIG_SCSI=y 66CONFIG_SCSI=y
67# CONFIG_SCSI_PROC_FS is not set 67# CONFIG_SCSI_PROC_FS is not set
68CONFIG_BLK_DEV_SD=y 68CONFIG_BLK_DEV_SD=y
@@ -99,10 +99,14 @@ CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200
99CONFIG_I2C=y 99CONFIG_I2C=y
100CONFIG_I2C_CHARDEV=y 100CONFIG_I2C_CHARDEV=y
101CONFIG_I2C_MPC=y 101CONFIG_I2C_MPC=y
102CONFIG_SPI=y
103CONFIG_SPI_MPC512x_PSC=y
104CONFIG_GPIOLIB=y
105CONFIG_GPIO_SYSFS=y
106CONFIG_GPIO_MPC8XXX=y
102# CONFIG_HWMON is not set 107# CONFIG_HWMON is not set
103CONFIG_MEDIA_SUPPORT=y 108CONFIG_MEDIA_SUPPORT=y
104CONFIG_VIDEO_DEV=y 109CONFIG_VIDEO_DEV=y
105# CONFIG_VIDEO_ALLOW_V4L1 is not set
106CONFIG_VIDEO_ADV_DEBUG=y 110CONFIG_VIDEO_ADV_DEBUG=y
107# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set 111# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
108CONFIG_VIDEO_SAA711X=y 112CONFIG_VIDEO_SAA711X=y
@@ -132,6 +136,5 @@ CONFIG_NLS_CODEPAGE_437=y
132CONFIG_NLS_ISO8859_1=y 136CONFIG_NLS_ISO8859_1=y
133# CONFIG_ENABLE_WARN_DEPRECATED is not set 137# CONFIG_ENABLE_WARN_DEPRECATED is not set
134# CONFIG_ENABLE_MUST_CHECK is not set 138# CONFIG_ENABLE_MUST_CHECK is not set
135# CONFIG_RCU_CPU_STALL_DETECTOR is not set
136# CONFIG_CRYPTO_ANSI_CPRNG is not set 139# CONFIG_CRYPTO_ANSI_CPRNG is not set
137# CONFIG_CRYPTO_HW is not set 140# CONFIG_CRYPTO_HW is not set