aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/mpc885_ads_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/mpc885_ads_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/mpc885_ads_defconfig')
-rw-r--r--arch/powerpc/configs/mpc885_ads_defconfig29
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 @@
1CONFIG_PPC_8xx=y 1CONFIG_PPC_8xx=y
2CONFIG_EXPERIMENTAL=y
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 6CONFIG_LOG_BUF_SHIFT=14
6# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
7CONFIG_EXPERT=y 7CONFIG_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
13CONFIG_PARTITION_ADVANCED=y
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15CONFIG_8xx_COPYBACK=y 15CONFIG_8xx_COPYBACK=y
16CONFIG_NO_HZ=y
17CONFIG_HIGH_RES_TIMERS=y
18CONFIG_HZ_100=y 16CONFIG_HZ_100=y
19CONFIG_8XX_MINIMAL_FPEMU=y
20CONFIG_SPARSE_IRQ=y
21# CONFIG_SECCOMP is not set 17# CONFIG_SECCOMP is not set
22CONFIG_NET=y 18CONFIG_NET=y
23CONFIG_PACKET=y 19CONFIG_PACKET=y
@@ -34,7 +30,6 @@ CONFIG_SYN_COOKIES=y
34CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
35# CONFIG_FW_LOADER is not set 31# CONFIG_FW_LOADER is not set
36CONFIG_MTD=y 32CONFIG_MTD=y
37CONFIG_MTD_CHAR=y
38CONFIG_MTD_BLOCK=y 33CONFIG_MTD_BLOCK=y
39CONFIG_MTD_JEDECPROBE=y 34CONFIG_MTD_JEDECPROBE=y
40CONFIG_MTD_CFI_ADV_OPTIONS=y 35CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -46,22 +41,17 @@ CONFIG_MTD_CFI_GEOMETRY=y
46CONFIG_MTD_CFI_I4=y 41CONFIG_MTD_CFI_I4=y
47CONFIG_MTD_CFI_AMDSTD=y 42CONFIG_MTD_CFI_AMDSTD=y
48CONFIG_MTD_PHYSMAP_OF=y 43CONFIG_MTD_PHYSMAP_OF=y
49CONFIG_PROC_DEVICETREE=y
50# CONFIG_BLK_DEV is not set 44# CONFIG_BLK_DEV is not set
51# CONFIG_MISC_DEVICES is not set
52CONFIG_NETDEVICES=y 45CONFIG_NETDEVICES=y
53CONFIG_DAVICOM_PHY=y
54CONFIG_NET_ETHERNET=y
55CONFIG_FS_ENET=y 46CONFIG_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 48CONFIG_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
62CONFIG_SERIAL_CPM=y 53CONFIG_SERIAL_CPM=y
63CONFIG_SERIAL_CPM_CONSOLE=y 54CONFIG_SERIAL_CPM_CONSOLE=y
64# CONFIG_LEGACY_PTYS is not set
65CONFIG_GEN_RTC=y 55CONFIG_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
69CONFIG_TMPFS=y 59CONFIG_TMPFS=y
70CONFIG_CRAMFS=y 60CONFIG_CRAMFS=y
71CONFIG_NFS_FS=y 61CONFIG_NFS_FS=y
72CONFIG_NFS_V3=y
73CONFIG_ROOT_NFS=y 62CONFIG_ROOT_NFS=y
74CONFIG_PARTITION_ADVANCED=y 63CONFIG_CRC32_SLICEBY4=y
75# CONFIG_CRC32 is not set 64CONFIG_DEBUG_INFO=y
76CONFIG_MAGIC_SYSRQ=y 65CONFIG_MAGIC_SYSRQ=y
77CONFIG_DEBUG_KERNEL=y
78CONFIG_DETECT_HUNG_TASK=y 66CONFIG_DETECT_HUNG_TASK=y
79CONFIG_DEBUG_INFO=y
80# CONFIG_RCU_CPU_STALL_DETECTOR is not set
81CONFIG_CRC32_SLICEBY4=y