diff options
author | Gerhard Sittig <gsi@denx.de> | 2013-06-18 07:17:21 -0400 |
---|---|---|
committer | Anatolij Gustschin <agust@denx.de> | 2013-06-25 02:37:17 -0400 |
commit | 6d18c9042c037f8600c9648260f76eae5170c0c3 (patch) | |
tree | 6cabf3b171cde273b2a46060c11175eaacfca14a /arch/powerpc/configs/mpc512x_defconfig | |
parent | 0875a88e8569c2ca306f321018238bd1a3d7fd86 (diff) |
powerpc/mpc512x: commit re-generated defconfig
This patch does not change the content, it merely re-orders
configuration items and drops explicit options which already
apply as the default.
Signed-off-by: Gerhard Sittig <gsi@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'arch/powerpc/configs/mpc512x_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc512x_defconfig | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/arch/powerpc/configs/mpc512x_defconfig b/arch/powerpc/configs/mpc512x_defconfig index 0d0d981442fd..5b8ee8080ecc 100644 --- a/arch/powerpc/configs/mpc512x_defconfig +++ b/arch/powerpc/configs/mpc512x_defconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | # CONFIG_SWAP is not set | 1 | # CONFIG_SWAP is not set |
3 | CONFIG_SYSVIPC=y | 2 | CONFIG_SYSVIPC=y |
4 | CONFIG_SPARSE_IRQ=y | 3 | CONFIG_NO_HZ=y |
5 | CONFIG_LOG_BUF_SHIFT=16 | 4 | CONFIG_LOG_BUF_SHIFT=16 |
6 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
7 | # CONFIG_COMPAT_BRK is not set | 6 | # CONFIG_COMPAT_BRK is not set |
@@ -9,6 +8,7 @@ CONFIG_SLAB=y | |||
9 | CONFIG_MODULES=y | 8 | CONFIG_MODULES=y |
10 | CONFIG_MODULE_UNLOAD=y | 9 | CONFIG_MODULE_UNLOAD=y |
11 | # CONFIG_BLK_DEV_BSG is not set | 10 | # CONFIG_BLK_DEV_BSG is not set |
11 | CONFIG_PARTITION_ADVANCED=y | ||
12 | # CONFIG_IOSCHED_CFQ is not set | 12 | # CONFIG_IOSCHED_CFQ is not set |
13 | # CONFIG_PPC_CHRP is not set | 13 | # CONFIG_PPC_CHRP is not set |
14 | CONFIG_PPC_MPC512x=y | 14 | CONFIG_PPC_MPC512x=y |
@@ -16,9 +16,7 @@ CONFIG_MPC5121_ADS=y | |||
16 | CONFIG_MPC512x_GENERIC=y | 16 | CONFIG_MPC512x_GENERIC=y |
17 | CONFIG_PDM360NG=y | 17 | CONFIG_PDM360NG=y |
18 | # CONFIG_PPC_PMAC is not set | 18 | # CONFIG_PPC_PMAC is not set |
19 | CONFIG_NO_HZ=y | ||
20 | CONFIG_HZ_1000=y | 19 | CONFIG_HZ_1000=y |
21 | # CONFIG_MIGRATION is not set | ||
22 | # CONFIG_SECCOMP is not set | 20 | # CONFIG_SECCOMP is not set |
23 | # CONFIG_PCI is not set | 21 | # CONFIG_PCI is not set |
24 | CONFIG_NET=y | 22 | CONFIG_NET=y |
@@ -33,8 +31,6 @@ CONFIG_IP_PNP=y | |||
33 | # CONFIG_INET_DIAG is not set | 31 | # CONFIG_INET_DIAG is not set |
34 | # CONFIG_IPV6 is not set | 32 | # CONFIG_IPV6 is not set |
35 | CONFIG_CAN=y | 33 | CONFIG_CAN=y |
36 | CONFIG_CAN_RAW=y | ||
37 | CONFIG_CAN_BCM=y | ||
38 | CONFIG_CAN_VCAN=y | 34 | CONFIG_CAN_VCAN=y |
39 | CONFIG_CAN_MSCAN=y | 35 | CONFIG_CAN_MSCAN=y |
40 | CONFIG_CAN_DEBUG_DEVICES=y | 36 | CONFIG_CAN_DEBUG_DEVICES=y |
@@ -46,7 +42,6 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
46 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 42 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
47 | CONFIG_MTD=y | 43 | CONFIG_MTD=y |
48 | CONFIG_MTD_CMDLINE_PARTS=y | 44 | CONFIG_MTD_CMDLINE_PARTS=y |
49 | CONFIG_MTD_CHAR=y | ||
50 | CONFIG_MTD_BLOCK=y | 45 | CONFIG_MTD_BLOCK=y |
51 | CONFIG_MTD_CFI=y | 46 | CONFIG_MTD_CFI=y |
52 | CONFIG_MTD_CFI_AMDSTD=y | 47 | CONFIG_MTD_CFI_AMDSTD=y |
@@ -60,7 +55,6 @@ CONFIG_BLK_DEV_RAM=y | |||
60 | CONFIG_BLK_DEV_RAM_COUNT=1 | 55 | CONFIG_BLK_DEV_RAM_COUNT=1 |
61 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 56 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
62 | CONFIG_BLK_DEV_XIP=y | 57 | CONFIG_BLK_DEV_XIP=y |
63 | CONFIG_MISC_DEVICES=y | ||
64 | CONFIG_EEPROM_AT24=y | 58 | CONFIG_EEPROM_AT24=y |
65 | CONFIG_EEPROM_AT25=y | 59 | CONFIG_EEPROM_AT25=y |
66 | CONFIG_SCSI=y | 60 | CONFIG_SCSI=y |
@@ -68,6 +62,7 @@ CONFIG_SCSI=y | |||
68 | CONFIG_BLK_DEV_SD=y | 62 | CONFIG_BLK_DEV_SD=y |
69 | CONFIG_CHR_DEV_SG=y | 63 | CONFIG_CHR_DEV_SG=y |
70 | CONFIG_NETDEVICES=y | 64 | CONFIG_NETDEVICES=y |
65 | CONFIG_FS_ENET=y | ||
71 | CONFIG_MARVELL_PHY=y | 66 | CONFIG_MARVELL_PHY=y |
72 | CONFIG_DAVICOM_PHY=y | 67 | CONFIG_DAVICOM_PHY=y |
73 | CONFIG_QSEMI_PHY=y | 68 | CONFIG_QSEMI_PHY=y |
@@ -83,10 +78,6 @@ CONFIG_STE10XP=y | |||
83 | CONFIG_LSI_ET1011C_PHY=y | 78 | CONFIG_LSI_ET1011C_PHY=y |
84 | CONFIG_FIXED_PHY=y | 79 | CONFIG_FIXED_PHY=y |
85 | CONFIG_MDIO_BITBANG=y | 80 | CONFIG_MDIO_BITBANG=y |
86 | CONFIG_NET_ETHERNET=y | ||
87 | CONFIG_FS_ENET=y | ||
88 | # CONFIG_NETDEV_1000 is not set | ||
89 | # CONFIG_NETDEV_10000 is not set | ||
90 | # CONFIG_WLAN is not set | 81 | # CONFIG_WLAN is not set |
91 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 82 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
92 | CONFIG_INPUT_EVDEV=y | 83 | CONFIG_INPUT_EVDEV=y |
@@ -106,10 +97,7 @@ CONFIG_GPIO_SYSFS=y | |||
106 | CONFIG_GPIO_MPC8XXX=y | 97 | CONFIG_GPIO_MPC8XXX=y |
107 | # CONFIG_HWMON is not set | 98 | # CONFIG_HWMON is not set |
108 | CONFIG_MEDIA_SUPPORT=y | 99 | CONFIG_MEDIA_SUPPORT=y |
109 | CONFIG_VIDEO_DEV=y | ||
110 | CONFIG_VIDEO_ADV_DEBUG=y | 100 | CONFIG_VIDEO_ADV_DEBUG=y |
111 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | ||
112 | CONFIG_VIDEO_SAA711X=y | ||
113 | CONFIG_FB=y | 101 | CONFIG_FB=y |
114 | CONFIG_FB_FSL_DIU=y | 102 | CONFIG_FB_FSL_DIU=y |
115 | # CONFIG_VGA_CONSOLE is not set | 103 | # CONFIG_VGA_CONSOLE is not set |
@@ -129,9 +117,7 @@ CONFIG_TMPFS=y | |||
129 | CONFIG_JFFS2_FS=y | 117 | CONFIG_JFFS2_FS=y |
130 | CONFIG_UBIFS_FS=y | 118 | CONFIG_UBIFS_FS=y |
131 | CONFIG_NFS_FS=y | 119 | CONFIG_NFS_FS=y |
132 | CONFIG_NFS_V3=y | ||
133 | CONFIG_ROOT_NFS=y | 120 | CONFIG_ROOT_NFS=y |
134 | CONFIG_PARTITION_ADVANCED=y | ||
135 | CONFIG_NLS_CODEPAGE_437=y | 121 | CONFIG_NLS_CODEPAGE_437=y |
136 | CONFIG_NLS_ISO8859_1=y | 122 | CONFIG_NLS_ISO8859_1=y |
137 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 123 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |