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/mpc5200_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/mpc5200_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc5200_defconfig | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index 69fd8adf9f5e..9fd041bfd778 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
3 | CONFIG_SPARSE_IRQ=y | 2 | CONFIG_NO_HZ=y |
3 | CONFIG_HIGH_RES_TIMERS=y | ||
4 | CONFIG_LOG_BUF_SHIFT=14 | 4 | CONFIG_LOG_BUF_SHIFT=14 |
5 | CONFIG_BLK_DEV_INITRD=y | 5 | CONFIG_BLK_DEV_INITRD=y |
6 | CONFIG_MODULES=y | 6 | CONFIG_MODULES=y |
@@ -16,8 +16,6 @@ CONFIG_PPC_MPC5200_BUGFIX=y | |||
16 | CONFIG_PPC_MPC5200_LPBFIFO=m | 16 | CONFIG_PPC_MPC5200_LPBFIFO=m |
17 | # CONFIG_PPC_PMAC is not set | 17 | # CONFIG_PPC_PMAC is not set |
18 | CONFIG_SIMPLE_GPIO=y | 18 | CONFIG_SIMPLE_GPIO=y |
19 | CONFIG_NO_HZ=y | ||
20 | CONFIG_HIGH_RES_TIMERS=y | ||
21 | CONFIG_NET=y | 19 | CONFIG_NET=y |
22 | CONFIG_PACKET=y | 20 | CONFIG_PACKET=y |
23 | CONFIG_UNIX=y | 21 | CONFIG_UNIX=y |
@@ -33,8 +31,6 @@ CONFIG_SYN_COOKIES=y | |||
33 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 31 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
34 | CONFIG_MTD=y | 32 | CONFIG_MTD=y |
35 | CONFIG_MTD_CMDLINE_PARTS=y | 33 | CONFIG_MTD_CMDLINE_PARTS=y |
36 | CONFIG_MTD_OF_PARTS=y | ||
37 | CONFIG_MTD_CHAR=y | ||
38 | CONFIG_MTD_BLOCK=y | 34 | CONFIG_MTD_BLOCK=y |
39 | CONFIG_MTD_CFI=y | 35 | CONFIG_MTD_CFI=y |
40 | CONFIG_MTD_CFI_AMDSTD=y | 36 | CONFIG_MTD_CFI_AMDSTD=y |
@@ -42,7 +38,6 @@ CONFIG_MTD_ROM=y | |||
42 | CONFIG_MTD_PHYSMAP_OF=y | 38 | CONFIG_MTD_PHYSMAP_OF=y |
43 | CONFIG_MTD_PLATRAM=y | 39 | CONFIG_MTD_PLATRAM=y |
44 | CONFIG_MTD_UBI=m | 40 | CONFIG_MTD_UBI=m |
45 | CONFIG_PROC_DEVICETREE=y | ||
46 | CONFIG_BLK_DEV_LOOP=y | 41 | CONFIG_BLK_DEV_LOOP=y |
47 | CONFIG_BLK_DEV_RAM=y | 42 | CONFIG_BLK_DEV_RAM=y |
48 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 43 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
@@ -77,7 +72,6 @@ CONFIG_SENSORS_LM87=m | |||
77 | CONFIG_WATCHDOG=y | 72 | CONFIG_WATCHDOG=y |
78 | CONFIG_MFD_SM501=m | 73 | CONFIG_MFD_SM501=m |
79 | CONFIG_DRM=y | 74 | CONFIG_DRM=y |
80 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
81 | CONFIG_FB=y | 75 | CONFIG_FB=y |
82 | CONFIG_FB_FOREIGN_ENDIAN=y | 76 | CONFIG_FB_FOREIGN_ENDIAN=y |
83 | CONFIG_FB_RADEON=y | 77 | CONFIG_FB_RADEON=y |
@@ -94,9 +88,6 @@ CONFIG_SND=y | |||
94 | # CONFIG_SND_SPI is not set | 88 | # CONFIG_SND_SPI is not set |
95 | # CONFIG_SND_USB is not set | 89 | # CONFIG_SND_USB is not set |
96 | CONFIG_SND_SOC=y | 90 | CONFIG_SND_SOC=y |
97 | CONFIG_SND_SOC_MPC5200_I2S=y | ||
98 | CONFIG_SND_MPC52xx_SOC_PCM030=y | ||
99 | CONFIG_SND_MPC52xx_SOC_EFIKA=y | ||
100 | CONFIG_HID_DRAGONRISE=y | 91 | CONFIG_HID_DRAGONRISE=y |
101 | CONFIG_HID_GYRATION=y | 92 | CONFIG_HID_GYRATION=y |
102 | CONFIG_HID_TWINHAN=y | 93 | CONFIG_HID_TWINHAN=y |
@@ -104,7 +95,6 @@ CONFIG_HID_ORTEK=y | |||
104 | CONFIG_HID_PANTHERLORD=y | 95 | CONFIG_HID_PANTHERLORD=y |
105 | CONFIG_HID_PETALYNX=y | 96 | CONFIG_HID_PETALYNX=y |
106 | CONFIG_HID_SAMSUNG=y | 97 | CONFIG_HID_SAMSUNG=y |
107 | CONFIG_HID_SONY=y | ||
108 | CONFIG_HID_SUNPLUS=y | 98 | CONFIG_HID_SUNPLUS=y |
109 | CONFIG_HID_GREENASIA=y | 99 | CONFIG_HID_GREENASIA=y |
110 | CONFIG_HID_SMARTJOYPLUS=y | 100 | CONFIG_HID_SMARTJOYPLUS=y |
@@ -112,7 +102,6 @@ CONFIG_HID_TOPSEED=y | |||
112 | CONFIG_HID_THRUSTMASTER=y | 102 | CONFIG_HID_THRUSTMASTER=y |
113 | CONFIG_HID_ZEROPLUS=y | 103 | CONFIG_HID_ZEROPLUS=y |
114 | CONFIG_USB=y | 104 | CONFIG_USB=y |
115 | # CONFIG_USB_DEVICE_CLASS is not set | ||
116 | CONFIG_USB_MON=y | 105 | CONFIG_USB_MON=y |
117 | CONFIG_USB_OHCI_HCD=y | 106 | CONFIG_USB_OHCI_HCD=y |
118 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 107 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
@@ -135,13 +124,12 @@ CONFIG_JFFS2_FS=y | |||
135 | CONFIG_UBIFS_FS=m | 124 | CONFIG_UBIFS_FS=m |
136 | CONFIG_CRAMFS=y | 125 | CONFIG_CRAMFS=y |
137 | CONFIG_NFS_FS=y | 126 | CONFIG_NFS_FS=y |
138 | CONFIG_NFS_V3=y | ||
139 | CONFIG_NFS_V4=y | 127 | CONFIG_NFS_V4=y |
140 | CONFIG_ROOT_NFS=y | 128 | CONFIG_ROOT_NFS=y |
141 | CONFIG_NLS_CODEPAGE_437=y | 129 | CONFIG_NLS_CODEPAGE_437=y |
142 | CONFIG_NLS_ISO8859_1=y | 130 | CONFIG_NLS_ISO8859_1=y |
143 | CONFIG_PRINTK_TIME=y | 131 | CONFIG_PRINTK_TIME=y |
132 | CONFIG_DEBUG_INFO=y | ||
144 | CONFIG_DEBUG_KERNEL=y | 133 | CONFIG_DEBUG_KERNEL=y |
145 | CONFIG_DETECT_HUNG_TASK=y | 134 | CONFIG_DETECT_HUNG_TASK=y |
146 | CONFIG_DEBUG_INFO=y | ||
147 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 135 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |