aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/mpc5200_defconfig
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-01-20 01:36:53 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-01-20 02:06:58 -0500
commita85cade6762bf566698e625ec1a4461245e40768 (patch)
treee6dc30c400417d313c2546aa0bc93ca1905608b5 /arch/powerpc/configs/mpc5200_defconfig
parent9a4fc4eaf111ca960c9f524b850598e9dbc9697f (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_defconfig18
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 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_SYSVIPC=y 1CONFIG_SYSVIPC=y
3CONFIG_SPARSE_IRQ=y 2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
4CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
5CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
6CONFIG_MODULES=y 6CONFIG_MODULES=y
@@ -16,8 +16,6 @@ CONFIG_PPC_MPC5200_BUGFIX=y
16CONFIG_PPC_MPC5200_LPBFIFO=m 16CONFIG_PPC_MPC5200_LPBFIFO=m
17# CONFIG_PPC_PMAC is not set 17# CONFIG_PPC_PMAC is not set
18CONFIG_SIMPLE_GPIO=y 18CONFIG_SIMPLE_GPIO=y
19CONFIG_NO_HZ=y
20CONFIG_HIGH_RES_TIMERS=y
21CONFIG_NET=y 19CONFIG_NET=y
22CONFIG_PACKET=y 20CONFIG_PACKET=y
23CONFIG_UNIX=y 21CONFIG_UNIX=y
@@ -33,8 +31,6 @@ CONFIG_SYN_COOKIES=y
33CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 31CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
34CONFIG_MTD=y 32CONFIG_MTD=y
35CONFIG_MTD_CMDLINE_PARTS=y 33CONFIG_MTD_CMDLINE_PARTS=y
36CONFIG_MTD_OF_PARTS=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 34CONFIG_MTD_BLOCK=y
39CONFIG_MTD_CFI=y 35CONFIG_MTD_CFI=y
40CONFIG_MTD_CFI_AMDSTD=y 36CONFIG_MTD_CFI_AMDSTD=y
@@ -42,7 +38,6 @@ CONFIG_MTD_ROM=y
42CONFIG_MTD_PHYSMAP_OF=y 38CONFIG_MTD_PHYSMAP_OF=y
43CONFIG_MTD_PLATRAM=y 39CONFIG_MTD_PLATRAM=y
44CONFIG_MTD_UBI=m 40CONFIG_MTD_UBI=m
45CONFIG_PROC_DEVICETREE=y
46CONFIG_BLK_DEV_LOOP=y 41CONFIG_BLK_DEV_LOOP=y
47CONFIG_BLK_DEV_RAM=y 42CONFIG_BLK_DEV_RAM=y
48CONFIG_BLK_DEV_RAM_SIZE=32768 43CONFIG_BLK_DEV_RAM_SIZE=32768
@@ -77,7 +72,6 @@ CONFIG_SENSORS_LM87=m
77CONFIG_WATCHDOG=y 72CONFIG_WATCHDOG=y
78CONFIG_MFD_SM501=m 73CONFIG_MFD_SM501=m
79CONFIG_DRM=y 74CONFIG_DRM=y
80CONFIG_VIDEO_OUTPUT_CONTROL=y
81CONFIG_FB=y 75CONFIG_FB=y
82CONFIG_FB_FOREIGN_ENDIAN=y 76CONFIG_FB_FOREIGN_ENDIAN=y
83CONFIG_FB_RADEON=y 77CONFIG_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
96CONFIG_SND_SOC=y 90CONFIG_SND_SOC=y
97CONFIG_SND_SOC_MPC5200_I2S=y
98CONFIG_SND_MPC52xx_SOC_PCM030=y
99CONFIG_SND_MPC52xx_SOC_EFIKA=y
100CONFIG_HID_DRAGONRISE=y 91CONFIG_HID_DRAGONRISE=y
101CONFIG_HID_GYRATION=y 92CONFIG_HID_GYRATION=y
102CONFIG_HID_TWINHAN=y 93CONFIG_HID_TWINHAN=y
@@ -104,7 +95,6 @@ CONFIG_HID_ORTEK=y
104CONFIG_HID_PANTHERLORD=y 95CONFIG_HID_PANTHERLORD=y
105CONFIG_HID_PETALYNX=y 96CONFIG_HID_PETALYNX=y
106CONFIG_HID_SAMSUNG=y 97CONFIG_HID_SAMSUNG=y
107CONFIG_HID_SONY=y
108CONFIG_HID_SUNPLUS=y 98CONFIG_HID_SUNPLUS=y
109CONFIG_HID_GREENASIA=y 99CONFIG_HID_GREENASIA=y
110CONFIG_HID_SMARTJOYPLUS=y 100CONFIG_HID_SMARTJOYPLUS=y
@@ -112,7 +102,6 @@ CONFIG_HID_TOPSEED=y
112CONFIG_HID_THRUSTMASTER=y 102CONFIG_HID_THRUSTMASTER=y
113CONFIG_HID_ZEROPLUS=y 103CONFIG_HID_ZEROPLUS=y
114CONFIG_USB=y 104CONFIG_USB=y
115# CONFIG_USB_DEVICE_CLASS is not set
116CONFIG_USB_MON=y 105CONFIG_USB_MON=y
117CONFIG_USB_OHCI_HCD=y 106CONFIG_USB_OHCI_HCD=y
118CONFIG_USB_OHCI_HCD_PPC_OF_BE=y 107CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
@@ -135,13 +124,12 @@ CONFIG_JFFS2_FS=y
135CONFIG_UBIFS_FS=m 124CONFIG_UBIFS_FS=m
136CONFIG_CRAMFS=y 125CONFIG_CRAMFS=y
137CONFIG_NFS_FS=y 126CONFIG_NFS_FS=y
138CONFIG_NFS_V3=y
139CONFIG_NFS_V4=y 127CONFIG_NFS_V4=y
140CONFIG_ROOT_NFS=y 128CONFIG_ROOT_NFS=y
141CONFIG_NLS_CODEPAGE_437=y 129CONFIG_NLS_CODEPAGE_437=y
142CONFIG_NLS_ISO8859_1=y 130CONFIG_NLS_ISO8859_1=y
143CONFIG_PRINTK_TIME=y 131CONFIG_PRINTK_TIME=y
132CONFIG_DEBUG_INFO=y
144CONFIG_DEBUG_KERNEL=y 133CONFIG_DEBUG_KERNEL=y
145CONFIG_DETECT_HUNG_TASK=y 134CONFIG_DETECT_HUNG_TASK=y
146CONFIG_DEBUG_INFO=y
147# CONFIG_CRYPTO_ANSI_CPRNG is not set 135# CONFIG_CRYPTO_ANSI_CPRNG is not set