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