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/mpc885_ads_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/mpc885_ads_defconfig')
-rw-r--r-- | arch/powerpc/configs/mpc885_ads_defconfig | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 3f47d00a10c0..2a10f98d4ee5 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig | |||
@@ -1,23 +1,19 @@ | |||
1 | CONFIG_PPC_8xx=y | 1 | CONFIG_PPC_8xx=y |
2 | CONFIG_EXPERIMENTAL=y | ||
3 | # CONFIG_SWAP is not set | 2 | # CONFIG_SWAP is not set |
4 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
4 | CONFIG_NO_HZ=y | ||
5 | CONFIG_HIGH_RES_TIMERS=y | ||
5 | CONFIG_LOG_BUF_SHIFT=14 | 6 | CONFIG_LOG_BUF_SHIFT=14 |
6 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
7 | CONFIG_EXPERT=y | 7 | CONFIG_EXPERT=y |
8 | # CONFIG_SYSCTL_SYSCALL is not set | ||
9 | # CONFIG_ELF_CORE is not set | 8 | # CONFIG_ELF_CORE is not set |
10 | # CONFIG_BASE_FULL is not set | 9 | # CONFIG_BASE_FULL is not set |
11 | # CONFIG_FUTEX is not set | 10 | # CONFIG_FUTEX is not set |
12 | # CONFIG_VM_EVENT_COUNTERS is not set | 11 | # CONFIG_VM_EVENT_COUNTERS is not set |
13 | # CONFIG_BLK_DEV_BSG is not set | 12 | # CONFIG_BLK_DEV_BSG is not set |
13 | CONFIG_PARTITION_ADVANCED=y | ||
14 | # CONFIG_IOSCHED_CFQ is not set | 14 | # CONFIG_IOSCHED_CFQ is not set |
15 | CONFIG_8xx_COPYBACK=y | 15 | CONFIG_8xx_COPYBACK=y |
16 | CONFIG_NO_HZ=y | ||
17 | CONFIG_HIGH_RES_TIMERS=y | ||
18 | CONFIG_HZ_100=y | 16 | CONFIG_HZ_100=y |
19 | CONFIG_8XX_MINIMAL_FPEMU=y | ||
20 | CONFIG_SPARSE_IRQ=y | ||
21 | # CONFIG_SECCOMP is not set | 17 | # CONFIG_SECCOMP is not set |
22 | CONFIG_NET=y | 18 | CONFIG_NET=y |
23 | CONFIG_PACKET=y | 19 | CONFIG_PACKET=y |
@@ -34,7 +30,6 @@ CONFIG_SYN_COOKIES=y | |||
34 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 30 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
35 | # CONFIG_FW_LOADER is not set | 31 | # CONFIG_FW_LOADER is not set |
36 | CONFIG_MTD=y | 32 | CONFIG_MTD=y |
37 | CONFIG_MTD_CHAR=y | ||
38 | CONFIG_MTD_BLOCK=y | 33 | CONFIG_MTD_BLOCK=y |
39 | CONFIG_MTD_JEDECPROBE=y | 34 | CONFIG_MTD_JEDECPROBE=y |
40 | CONFIG_MTD_CFI_ADV_OPTIONS=y | 35 | CONFIG_MTD_CFI_ADV_OPTIONS=y |
@@ -46,22 +41,17 @@ CONFIG_MTD_CFI_GEOMETRY=y | |||
46 | CONFIG_MTD_CFI_I4=y | 41 | CONFIG_MTD_CFI_I4=y |
47 | CONFIG_MTD_CFI_AMDSTD=y | 42 | CONFIG_MTD_CFI_AMDSTD=y |
48 | CONFIG_MTD_PHYSMAP_OF=y | 43 | CONFIG_MTD_PHYSMAP_OF=y |
49 | CONFIG_PROC_DEVICETREE=y | ||
50 | # CONFIG_BLK_DEV is not set | 44 | # CONFIG_BLK_DEV is not set |
51 | # CONFIG_MISC_DEVICES is not set | ||
52 | CONFIG_NETDEVICES=y | 45 | CONFIG_NETDEVICES=y |
53 | CONFIG_DAVICOM_PHY=y | ||
54 | CONFIG_NET_ETHERNET=y | ||
55 | CONFIG_FS_ENET=y | 46 | CONFIG_FS_ENET=y |
56 | # CONFIG_FS_ENET_HAS_SCC is not set | 47 | # CONFIG_FS_ENET_HAS_SCC is not set |
57 | # CONFIG_NETDEV_1000 is not set | 48 | CONFIG_DAVICOM_PHY=y |
58 | # CONFIG_NETDEV_10000 is not set | ||
59 | # CONFIG_INPUT is not set | 49 | # CONFIG_INPUT is not set |
60 | # CONFIG_SERIO is not set | 50 | # CONFIG_SERIO is not set |
61 | # CONFIG_VT is not set | 51 | # CONFIG_VT is not set |
52 | # CONFIG_LEGACY_PTYS is not set | ||
62 | CONFIG_SERIAL_CPM=y | 53 | CONFIG_SERIAL_CPM=y |
63 | CONFIG_SERIAL_CPM_CONSOLE=y | 54 | CONFIG_SERIAL_CPM_CONSOLE=y |
64 | # CONFIG_LEGACY_PTYS is not set | ||
65 | CONFIG_GEN_RTC=y | 55 | CONFIG_GEN_RTC=y |
66 | # CONFIG_HWMON is not set | 56 | # CONFIG_HWMON is not set |
67 | # CONFIG_USB_SUPPORT is not set | 57 | # CONFIG_USB_SUPPORT is not set |
@@ -69,13 +59,8 @@ CONFIG_GEN_RTC=y | |||
69 | CONFIG_TMPFS=y | 59 | CONFIG_TMPFS=y |
70 | CONFIG_CRAMFS=y | 60 | CONFIG_CRAMFS=y |
71 | CONFIG_NFS_FS=y | 61 | CONFIG_NFS_FS=y |
72 | CONFIG_NFS_V3=y | ||
73 | CONFIG_ROOT_NFS=y | 62 | CONFIG_ROOT_NFS=y |
74 | CONFIG_PARTITION_ADVANCED=y | 63 | CONFIG_CRC32_SLICEBY4=y |
75 | # CONFIG_CRC32 is not set | 64 | CONFIG_DEBUG_INFO=y |
76 | CONFIG_MAGIC_SYSRQ=y | 65 | CONFIG_MAGIC_SYSRQ=y |
77 | CONFIG_DEBUG_KERNEL=y | ||
78 | CONFIG_DETECT_HUNG_TASK=y | 66 | CONFIG_DETECT_HUNG_TASK=y |
79 | CONFIG_DEBUG_INFO=y | ||
80 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
81 | CONFIG_CRC32_SLICEBY4=y | ||