diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-20 01:36:53 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-20 02:06:58 -0500 |
commit | a85cade6762bf566698e625ec1a4461245e40768 (patch) | |
tree | e6dc30c400417d313c2546aa0bc93ca1905608b5 /arch/powerpc/configs/52xx/cm5200_defconfig | |
parent | 9a4fc4eaf111ca960c9f524b850598e9dbc9697f (diff) |
powerpc: Update all configs using savedefconfig
It looks like it's ~4 years since we updated some of these, so do a bulk
update.
Verified that the before and after generated configs are exactly the
same.
Which begs the question why update them? The answer is that it can be
confusing when the stored defconfig drifts too far from the generated
result.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/52xx/cm5200_defconfig')
-rw-r--r-- | arch/powerpc/configs/52xx/cm5200_defconfig | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/arch/powerpc/configs/52xx/cm5200_defconfig b/arch/powerpc/configs/52xx/cm5200_defconfig index 0dc99e141035..19fad0e0016e 100644 --- a/arch/powerpc/configs/52xx/cm5200_defconfig +++ b/arch/powerpc/configs/52xx/cm5200_defconfig | |||
@@ -1,18 +1,15 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
3 | CONFIG_LOG_BUF_SHIFT=14 | 2 | CONFIG_LOG_BUF_SHIFT=14 |
4 | CONFIG_BLK_DEV_INITRD=y | 3 | CONFIG_BLK_DEV_INITRD=y |
5 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
6 | CONFIG_EXPERT=y | 4 | CONFIG_EXPERT=y |
7 | # CONFIG_SYSCTL_SYSCALL is not set | ||
8 | # CONFIG_KALLSYMS is not set | 5 | # CONFIG_KALLSYMS is not set |
9 | # CONFIG_EPOLL is not set | 6 | # CONFIG_EPOLL is not set |
10 | # CONFIG_BLK_DEV_BSG is not set | 7 | # CONFIG_BLK_DEV_BSG is not set |
8 | CONFIG_PARTITION_ADVANCED=y | ||
11 | # CONFIG_PPC_CHRP is not set | 9 | # CONFIG_PPC_CHRP is not set |
12 | CONFIG_PPC_MPC52xx=y | 10 | CONFIG_PPC_MPC52xx=y |
13 | CONFIG_PPC_MPC5200_SIMPLE=y | 11 | CONFIG_PPC_MPC5200_SIMPLE=y |
14 | # CONFIG_PPC_PMAC is not set | 12 | # CONFIG_PPC_PMAC is not set |
15 | CONFIG_SPARSE_IRQ=y | ||
16 | CONFIG_PM=y | 13 | CONFIG_PM=y |
17 | # CONFIG_PCI is not set | 14 | # CONFIG_PCI is not set |
18 | CONFIG_NET=y | 15 | CONFIG_NET=y |
@@ -31,26 +28,20 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
31 | # CONFIG_FW_LOADER is not set | 28 | # CONFIG_FW_LOADER is not set |
32 | CONFIG_MTD=y | 29 | CONFIG_MTD=y |
33 | CONFIG_MTD_CMDLINE_PARTS=y | 30 | CONFIG_MTD_CMDLINE_PARTS=y |
34 | CONFIG_MTD_CHAR=y | ||
35 | CONFIG_MTD_BLOCK=y | 31 | CONFIG_MTD_BLOCK=y |
36 | CONFIG_MTD_CFI=y | 32 | CONFIG_MTD_CFI=y |
37 | CONFIG_MTD_CFI_AMDSTD=y | 33 | CONFIG_MTD_CFI_AMDSTD=y |
38 | CONFIG_MTD_PHYSMAP_OF=y | 34 | CONFIG_MTD_PHYSMAP_OF=y |
39 | CONFIG_PROC_DEVICETREE=y | ||
40 | CONFIG_BLK_DEV_LOOP=y | 35 | CONFIG_BLK_DEV_LOOP=y |
41 | CONFIG_BLK_DEV_RAM=y | 36 | CONFIG_BLK_DEV_RAM=y |
42 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 37 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
43 | # CONFIG_MISC_DEVICES is not set | ||
44 | CONFIG_SCSI=y | 38 | CONFIG_SCSI=y |
45 | CONFIG_BLK_DEV_SD=y | 39 | CONFIG_BLK_DEV_SD=y |
46 | CONFIG_CHR_DEV_SG=y | 40 | CONFIG_CHR_DEV_SG=y |
47 | # CONFIG_SCSI_LOWLEVEL is not set | 41 | # CONFIG_SCSI_LOWLEVEL is not set |
48 | CONFIG_NETDEVICES=y | 42 | CONFIG_NETDEVICES=y |
49 | CONFIG_LXT_PHY=y | ||
50 | CONFIG_NET_ETHERNET=y | ||
51 | CONFIG_FEC_MPC52xx=y | 43 | CONFIG_FEC_MPC52xx=y |
52 | # CONFIG_NETDEV_1000 is not set | 44 | CONFIG_LXT_PHY=y |
53 | # CONFIG_NETDEV_10000 is not set | ||
54 | # CONFIG_INPUT is not set | 45 | # CONFIG_INPUT is not set |
55 | # CONFIG_SERIO is not set | 46 | # CONFIG_SERIO is not set |
56 | # CONFIG_VT is not set | 47 | # CONFIG_VT is not set |
@@ -64,7 +55,6 @@ CONFIG_I2C_MPC=y | |||
64 | # CONFIG_HWMON is not set | 55 | # CONFIG_HWMON is not set |
65 | CONFIG_WATCHDOG=y | 56 | CONFIG_WATCHDOG=y |
66 | CONFIG_USB=y | 57 | CONFIG_USB=y |
67 | # CONFIG_USB_DEVICE_CLASS is not set | ||
68 | CONFIG_USB_OHCI_HCD=y | 58 | CONFIG_USB_OHCI_HCD=y |
69 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 59 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
70 | CONFIG_USB_STORAGE=y | 60 | CONFIG_USB_STORAGE=y |
@@ -73,7 +63,6 @@ CONFIG_PPC_BESTCOMM=y | |||
73 | CONFIG_EXT2_FS=y | 63 | CONFIG_EXT2_FS=y |
74 | CONFIG_EXT3_FS=y | 64 | CONFIG_EXT3_FS=y |
75 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 65 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
76 | CONFIG_INOTIFY=y | ||
77 | CONFIG_MSDOS_FS=y | 66 | CONFIG_MSDOS_FS=y |
78 | CONFIG_VFAT_FS=y | 67 | CONFIG_VFAT_FS=y |
79 | CONFIG_PROC_KCORE=y | 68 | CONFIG_PROC_KCORE=y |
@@ -81,17 +70,13 @@ CONFIG_TMPFS=y | |||
81 | CONFIG_JFFS2_FS=y | 70 | CONFIG_JFFS2_FS=y |
82 | CONFIG_CRAMFS=y | 71 | CONFIG_CRAMFS=y |
83 | CONFIG_NFS_FS=y | 72 | CONFIG_NFS_FS=y |
84 | CONFIG_NFS_V3=y | ||
85 | CONFIG_NFS_V4=y | 73 | CONFIG_NFS_V4=y |
86 | CONFIG_ROOT_NFS=y | 74 | CONFIG_ROOT_NFS=y |
87 | CONFIG_PARTITION_ADVANCED=y | ||
88 | CONFIG_NLS_CODEPAGE_437=y | 75 | CONFIG_NLS_CODEPAGE_437=y |
89 | CONFIG_NLS_ISO8859_1=y | 76 | CONFIG_NLS_ISO8859_1=y |
90 | CONFIG_PRINTK_TIME=y | 77 | CONFIG_PRINTK_TIME=y |
91 | CONFIG_DEBUG_KERNEL=y | ||
92 | CONFIG_DETECT_HUNG_TASK=y | 78 | CONFIG_DETECT_HUNG_TASK=y |
93 | # CONFIG_DEBUG_BUGVERBOSE is not set | 79 | # CONFIG_DEBUG_BUGVERBOSE is not set |
94 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
95 | CONFIG_CRYPTO_ECB=y | 80 | CONFIG_CRYPTO_ECB=y |
96 | CONFIG_CRYPTO_PCBC=y | 81 | CONFIG_CRYPTO_PCBC=y |
97 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 82 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |