aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/40x/acadia_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/40x/acadia_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/40x/acadia_defconfig')
-rw-r--r--arch/powerpc/configs/40x/acadia_defconfig21
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index 69e06eeae6a6..9110a5cb1bb7 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_defconfig
@@ -1,19 +1,15 @@
1CONFIG_40x=y 1CONFIG_40x=y
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
5CONFIG_LOG_BUF_SHIFT=14 4CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 5CONFIG_BLK_DEV_INITRD=y
7# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
8CONFIG_EXPERT=y 6CONFIG_EXPERT=y
9CONFIG_KALLSYMS_ALL=y 7CONFIG_KALLSYMS_ALL=y
10CONFIG_KALLSYMS_EXTRA_PASS=y
11CONFIG_MODULES=y 8CONFIG_MODULES=y
12CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
13# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
14CONFIG_ACADIA=y 11CONFIG_ACADIA=y
15# CONFIG_WALNUT is not set 12# CONFIG_WALNUT is not set
16CONFIG_SPARSE_IRQ=y
17CONFIG_PCI=y 13CONFIG_PCI=y
18CONFIG_NET=y 14CONFIG_NET=y
19CONFIG_PACKET=y 15CONFIG_PACKET=y
@@ -31,27 +27,18 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
31CONFIG_CONNECTOR=y 27CONFIG_CONNECTOR=y
32CONFIG_MTD=y 28CONFIG_MTD=y
33CONFIG_MTD_CMDLINE_PARTS=y 29CONFIG_MTD_CMDLINE_PARTS=y
34CONFIG_MTD_OF_PARTS=y
35CONFIG_MTD_CHAR=y
36CONFIG_MTD_BLOCK=m 30CONFIG_MTD_BLOCK=m
37CONFIG_MTD_CFI=y 31CONFIG_MTD_CFI=y
38CONFIG_MTD_JEDECPROBE=y 32CONFIG_MTD_JEDECPROBE=y
39CONFIG_MTD_CFI_AMDSTD=y 33CONFIG_MTD_CFI_AMDSTD=y
40CONFIG_MTD_PHYSMAP_OF=y 34CONFIG_MTD_PHYSMAP_OF=y
41CONFIG_PROC_DEVICETREE=y
42CONFIG_BLK_DEV_RAM=y 35CONFIG_BLK_DEV_RAM=y
43CONFIG_BLK_DEV_RAM_SIZE=35000 36CONFIG_BLK_DEV_RAM_SIZE=35000
44# CONFIG_MISC_DEVICES is not set
45CONFIG_NETDEVICES=y 37CONFIG_NETDEVICES=y
46CONFIG_ETHERNET=y
47CONFIG_NET_VENDOR_IBM=y
48CONFIG_MII=y
49CONFIG_IBM_EMAC=y 38CONFIG_IBM_EMAC=y
50CONFIG_IBM_EMAC_RXB=256 39CONFIG_IBM_EMAC_RXB=256
51CONFIG_IBM_EMAC_TXB=256 40CONFIG_IBM_EMAC_TXB=256
52CONFIG_IBM_EMAC_DEBUG=y 41CONFIG_IBM_EMAC_DEBUG=y
53# CONFIG_NETDEV_1000 is not set
54# CONFIG_NETDEV_10000 is not set
55# CONFIG_INPUT is not set 42# CONFIG_INPUT is not set
56# CONFIG_SERIO is not set 43# CONFIG_SERIO is not set
57# CONFIG_VT is not set 44# CONFIG_VT is not set
@@ -65,20 +52,14 @@ CONFIG_SERIAL_OF_PLATFORM=y
65CONFIG_THERMAL=y 52CONFIG_THERMAL=y
66# CONFIG_USB_SUPPORT is not set 53# CONFIG_USB_SUPPORT is not set
67CONFIG_EXT2_FS=y 54CONFIG_EXT2_FS=y
68CONFIG_INOTIFY=y
69CONFIG_PROC_KCORE=y 55CONFIG_PROC_KCORE=y
70CONFIG_TMPFS=y 56CONFIG_TMPFS=y
71CONFIG_CRAMFS=y 57CONFIG_CRAMFS=y
72CONFIG_NFS_FS=y 58CONFIG_NFS_FS=y
73CONFIG_NFS_V3=y
74CONFIG_ROOT_NFS=y 59CONFIG_ROOT_NFS=y
75CONFIG_MAGIC_SYSRQ=y
76CONFIG_DEBUG_FS=y 60CONFIG_DEBUG_FS=y
77CONFIG_DEBUG_KERNEL=y 61CONFIG_MAGIC_SYSRQ=y
78CONFIG_DETECT_HUNG_TASK=y 62CONFIG_DETECT_HUNG_TASK=y
79# CONFIG_RCU_CPU_STALL_DETECTOR is not set
80CONFIG_SYSCTL_SYSCALL_CHECK=y
81CONFIG_CRYPTO=y
82CONFIG_CRYPTO_CBC=y 63CONFIG_CRYPTO_CBC=y
83CONFIG_CRYPTO_ECB=y 64CONFIG_CRYPTO_ECB=y
84CONFIG_CRYPTO_PCBC=y 65CONFIG_CRYPTO_PCBC=y