diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:58:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 20:58:22 -0500 |
commit | e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d (patch) | |
tree | 9eef6998f5bbd1a2c999011d9e0151f00c6e7297 /arch/powerpc/configs | |
parent | 9753dfe19a85e7e45a34a56f4cb2048bb4f50e27 (diff) | |
parent | ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4 (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)
powerpc: fix compile error with 85xx/p1010rdb.c
powerpc: fix compile error with 85xx/p1023_rds.c
powerpc/fsl: add MSI support for the Freescale hypervisor
arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree
powerpc/fsl: Add support for Integrated Flash Controller
powerpc/fsl: update compatiable on fsl 16550 uart nodes
powerpc/85xx: fix PCI and localbus properties in p1022ds.dts
powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig
powerpc/fsl: Update defconfigs to enable some standard FSL HW features
powerpc: Add TBI PHY node to first MDIO bus
sbc834x: put full compat string in board match check
powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address
powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
offb: Fix setting of the pseudo-palette for >8bpp
offb: Add palette hack for qemu "standard vga" framebuffer
offb: Fix bug in calculating requested vram size
powerpc/boot: Change the WARN to INFO for boot wrapper overlap message
powerpc/44x: Fix build error on currituck platform
powerpc/boot: Change the load address for the wrapper to fit the kernel
powerpc/44x: Enable CRASH_DUMP for 440x
...
Fix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to
the additional sparse-checking code for cputime_t.
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r-- | arch/powerpc/configs/40x/klondike_defconfig | 55 | ||||
-rw-r--r-- | arch/powerpc/configs/40x/obs600_defconfig | 83 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/currituck_defconfig | 110 | ||||
-rw-r--r-- | arch/powerpc/configs/44x/iss476-smp_defconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/configs/chroma_defconfig | 307 | ||||
-rw-r--r-- | arch/powerpc/configs/corenet32_smp_defconfig | 11 | ||||
-rw-r--r-- | arch/powerpc/configs/corenet64_smp_defconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 17 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc85xx_smp_defconfig | 18 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/configs/ps3_defconfig | 39 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 5 |
12 files changed, 622 insertions, 35 deletions
diff --git a/arch/powerpc/configs/40x/klondike_defconfig b/arch/powerpc/configs/40x/klondike_defconfig new file mode 100644 index 00000000000..c0d228dc73d --- /dev/null +++ b/arch/powerpc/configs/40x/klondike_defconfig | |||
@@ -0,0 +1,55 @@ | |||
1 | CONFIG_40x=y | ||
2 | CONFIG_EXPERIMENTAL=y | ||
3 | CONFIG_SYSVIPC=y | ||
4 | CONFIG_LOG_BUF_SHIFT=14 | ||
5 | CONFIG_SYSFS_DEPRECATED=y | ||
6 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
7 | CONFIG_BLK_DEV_INITRD=y | ||
8 | CONFIG_SYSCTL_SYSCALL=y | ||
9 | CONFIG_EMBEDDED=y | ||
10 | CONFIG_SLAB=y | ||
11 | CONFIG_MODULES=y | ||
12 | CONFIG_MODULE_UNLOAD=y | ||
13 | # CONFIG_WALNUT is not set | ||
14 | CONFIG_APM8018X=y | ||
15 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
16 | CONFIG_MATH_EMULATION=y | ||
17 | # CONFIG_MIGRATION is not set | ||
18 | # CONFIG_SUSPEND is not set | ||
19 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
20 | CONFIG_PROC_DEVICETREE=y | ||
21 | CONFIG_BLK_DEV_RAM=y | ||
22 | CONFIG_BLK_DEV_RAM_SIZE=35000 | ||
23 | CONFIG_SCSI=y | ||
24 | CONFIG_BLK_DEV_SD=y | ||
25 | CONFIG_CHR_DEV_SG=y | ||
26 | CONFIG_SCSI_SAS_ATTRS=y | ||
27 | # CONFIG_INPUT is not set | ||
28 | # CONFIG_SERIO is not set | ||
29 | # CONFIG_VT is not set | ||
30 | # CONFIG_UNIX98_PTYS is not set | ||
31 | # CONFIG_LEGACY_PTYS is not set | ||
32 | # CONFIG_DEVKMEM is not set | ||
33 | # CONFIG_HW_RANDOM is not set | ||
34 | # CONFIG_HWMON is not set | ||
35 | # CONFIG_USB_SUPPORT is not set | ||
36 | # CONFIG_IOMMU_SUPPORT is not set | ||
37 | CONFIG_EXT2_FS=y | ||
38 | CONFIG_EXT3_FS=y | ||
39 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
40 | CONFIG_EXT4_FS=y | ||
41 | CONFIG_MSDOS_FS=y | ||
42 | CONFIG_VFAT_FS=y | ||
43 | CONFIG_PROC_KCORE=y | ||
44 | CONFIG_TMPFS=y | ||
45 | CONFIG_CRAMFS=y | ||
46 | CONFIG_NLS_CODEPAGE_437=y | ||
47 | CONFIG_NLS_ASCII=y | ||
48 | CONFIG_NLS_ISO8859_1=y | ||
49 | CONFIG_NLS_UTF8=y | ||
50 | CONFIG_AVERAGE=y | ||
51 | CONFIG_MAGIC_SYSRQ=y | ||
52 | # CONFIG_SCHED_DEBUG is not set | ||
53 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
54 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
55 | # CONFIG_FTRACE is not set | ||
diff --git a/arch/powerpc/configs/40x/obs600_defconfig b/arch/powerpc/configs/40x/obs600_defconfig new file mode 100644 index 00000000000..91c110dad2d --- /dev/null +++ b/arch/powerpc/configs/40x/obs600_defconfig | |||
@@ -0,0 +1,83 @@ | |||
1 | CONFIG_40x=y | ||
2 | CONFIG_EXPERIMENTAL=y | ||
3 | CONFIG_SYSVIPC=y | ||
4 | CONFIG_POSIX_MQUEUE=y | ||
5 | CONFIG_LOG_BUF_SHIFT=14 | ||
6 | CONFIG_BLK_DEV_INITRD=y | ||
7 | CONFIG_EXPERT=y | ||
8 | CONFIG_KALLSYMS_ALL=y | ||
9 | CONFIG_MODULES=y | ||
10 | CONFIG_MODULE_UNLOAD=y | ||
11 | # CONFIG_BLK_DEV_BSG is not set | ||
12 | # CONFIG_WALNUT is not set | ||
13 | CONFIG_OBS600=y | ||
14 | CONFIG_NO_HZ=y | ||
15 | CONFIG_HIGH_RES_TIMERS=y | ||
16 | CONFIG_MATH_EMULATION=y | ||
17 | CONFIG_NET=y | ||
18 | CONFIG_PACKET=y | ||
19 | CONFIG_UNIX=y | ||
20 | CONFIG_INET=y | ||
21 | CONFIG_IP_PNP=y | ||
22 | CONFIG_IP_PNP_DHCP=y | ||
23 | CONFIG_IP_PNP_BOOTP=y | ||
24 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
25 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
26 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
27 | # CONFIG_INET_LRO is not set | ||
28 | # CONFIG_IPV6 is not set | ||
29 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
30 | CONFIG_CONNECTOR=y | ||
31 | CONFIG_MTD=y | ||
32 | CONFIG_MTD_CMDLINE_PARTS=y | ||
33 | CONFIG_MTD_OF_PARTS=y | ||
34 | CONFIG_MTD_CHAR=y | ||
35 | CONFIG_MTD_BLOCK=y | ||
36 | CONFIG_MTD_CFI=y | ||
37 | CONFIG_MTD_JEDECPROBE=y | ||
38 | CONFIG_MTD_CFI_AMDSTD=y | ||
39 | CONFIG_MTD_PHYSMAP_OF=y | ||
40 | CONFIG_MTD_NAND=y | ||
41 | CONFIG_MTD_NAND_NDFC=y | ||
42 | CONFIG_PROC_DEVICETREE=y | ||
43 | CONFIG_BLK_DEV_RAM=y | ||
44 | CONFIG_BLK_DEV_RAM_SIZE=35000 | ||
45 | CONFIG_NETDEVICES=y | ||
46 | CONFIG_IBM_EMAC=y | ||
47 | CONFIG_IBM_EMAC_RXB=256 | ||
48 | CONFIG_IBM_EMAC_TXB=256 | ||
49 | # CONFIG_INPUT is not set | ||
50 | # CONFIG_SERIO is not set | ||
51 | # CONFIG_VT is not set | ||
52 | CONFIG_SERIAL_8250=y | ||
53 | CONFIG_SERIAL_8250_CONSOLE=y | ||
54 | CONFIG_SERIAL_8250_EXTENDED=y | ||
55 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
56 | CONFIG_SERIAL_OF_PLATFORM=y | ||
57 | # CONFIG_HW_RANDOM is not set | ||
58 | CONFIG_I2C=y | ||
59 | CONFIG_I2C_CHARDEV=y | ||
60 | CONFIG_I2C_IBM_IIC=y | ||
61 | CONFIG_SENSORS_LM75=y | ||
62 | CONFIG_THERMAL=y | ||
63 | # CONFIG_USB_SUPPORT is not set | ||
64 | CONFIG_RTC_CLASS=y | ||
65 | CONFIG_RTC_DRV_DS1307=y | ||
66 | CONFIG_EXT2_FS=y | ||
67 | CONFIG_PROC_KCORE=y | ||
68 | CONFIG_TMPFS=y | ||
69 | CONFIG_CRAMFS=y | ||
70 | CONFIG_NFS_FS=y | ||
71 | CONFIG_NFS_V3=y | ||
72 | CONFIG_ROOT_NFS=y | ||
73 | CONFIG_MAGIC_SYSRQ=y | ||
74 | CONFIG_DEBUG_FS=y | ||
75 | CONFIG_DETECT_HUNG_TASK=y | ||
76 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
77 | CONFIG_CRYPTO=y | ||
78 | CONFIG_CRYPTO_CBC=y | ||
79 | CONFIG_CRYPTO_ECB=y | ||
80 | CONFIG_CRYPTO_PCBC=y | ||
81 | CONFIG_CRYPTO_MD5=y | ||
82 | CONFIG_CRYPTO_DES=y | ||
83 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig new file mode 100644 index 00000000000..4192322f8a7 --- /dev/null +++ b/arch/powerpc/configs/44x/currituck_defconfig | |||
@@ -0,0 +1,110 @@ | |||
1 | CONFIG_44x=y | ||
2 | CONFIG_SMP=y | ||
3 | CONFIG_EXPERIMENTAL=y | ||
4 | CONFIG_SYSVIPC=y | ||
5 | CONFIG_POSIX_MQUEUE=y | ||
6 | CONFIG_SPARSE_IRQ=y | ||
7 | CONFIG_LOG_BUF_SHIFT=14 | ||
8 | CONFIG_EXPERT=y | ||
9 | CONFIG_KALLSYMS_ALL=y | ||
10 | CONFIG_PROFILING=y | ||
11 | CONFIG_OPROFILE=y | ||
12 | CONFIG_MODULES=y | ||
13 | CONFIG_MODULE_UNLOAD=y | ||
14 | # CONFIG_BLK_DEV_BSG is not set | ||
15 | CONFIG_PPC_47x=y | ||
16 | # CONFIG_EBONY is not set | ||
17 | CONFIG_CURRITUCK=y | ||
18 | CONFIG_HIGHMEM=y | ||
19 | CONFIG_HZ_100=y | ||
20 | CONFIG_MATH_EMULATION=y | ||
21 | CONFIG_IRQ_ALL_CPUS=y | ||
22 | CONFIG_CMDLINE_BOOL=y | ||
23 | CONFIG_CMDLINE="" | ||
24 | # CONFIG_SUSPEND is not set | ||
25 | CONFIG_NET=y | ||
26 | CONFIG_PACKET=y | ||
27 | CONFIG_UNIX=y | ||
28 | CONFIG_INET=y | ||
29 | CONFIG_IP_PNP=y | ||
30 | CONFIG_IP_PNP_DHCP=y | ||
31 | CONFIG_IP_PNP_BOOTP=y | ||
32 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
33 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
34 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
35 | # CONFIG_INET_LRO is not set | ||
36 | # CONFIG_IPV6 is not set | ||
37 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
38 | CONFIG_DEVTMPFS=y | ||
39 | CONFIG_DEVTMPFS_MOUNT=y | ||
40 | CONFIG_CONNECTOR=y | ||
41 | CONFIG_MTD=y | ||
42 | CONFIG_MTD_CHAR=y | ||
43 | CONFIG_MTD_BLOCK=y | ||
44 | CONFIG_MTD_JEDECPROBE=y | ||
45 | CONFIG_MTD_CFI_AMDSTD=y | ||
46 | CONFIG_MTD_PHYSMAP_OF=y | ||
47 | CONFIG_PROC_DEVICETREE=y | ||
48 | CONFIG_BLK_DEV_RAM=y | ||
49 | CONFIG_BLK_DEV_RAM_SIZE=35000 | ||
50 | # CONFIG_SCSI_PROC_FS is not set | ||
51 | CONFIG_BLK_DEV_SD=y | ||
52 | # CONFIG_SCSI_LOWLEVEL is not set | ||
53 | CONFIG_ATA=y | ||
54 | # CONFIG_SATA_PMP is not set | ||
55 | CONFIG_SATA_SIL24=y | ||
56 | # CONFIG_ATA_SFF is not set | ||
57 | CONFIG_NETDEVICES=y | ||
58 | CONFIG_E1000E=y | ||
59 | # CONFIG_NETDEV_10000 is not set | ||
60 | # CONFIG_INPUT is not set | ||
61 | # CONFIG_SERIO is not set | ||
62 | # CONFIG_VT is not set | ||
63 | CONFIG_SERIAL_8250=y | ||
64 | CONFIG_SERIAL_8250_CONSOLE=y | ||
65 | CONFIG_SERIAL_8250_EXTENDED=y | ||
66 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
67 | CONFIG_SERIAL_OF_PLATFORM=y | ||
68 | # CONFIG_HW_RANDOM is not set | ||
69 | CONFIG_I2C=y | ||
70 | CONFIG_I2C_IBM_IIC=y | ||
71 | # CONFIG_HWMON is not set | ||
72 | CONFIG_THERMAL=y | ||
73 | CONFIG_USB=y | ||
74 | CONFIG_USB_DEBUG=y | ||
75 | CONFIG_USB_EHCI_HCD=y | ||
76 | CONFIG_USB_OHCI_HCD=y | ||
77 | CONFIG_RTC_CLASS=y | ||
78 | CONFIG_RTC_DRV_M41T80=y | ||
79 | CONFIG_EXT2_FS=y | ||
80 | CONFIG_EXT3_FS=y | ||
81 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
82 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
83 | CONFIG_EXT3_FS_SECURITY=y | ||
84 | CONFIG_PROC_KCORE=y | ||
85 | CONFIG_TMPFS=y | ||
86 | CONFIG_CRAMFS=y | ||
87 | CONFIG_NFS_FS=y | ||
88 | CONFIG_NFS_V3=y | ||
89 | CONFIG_NFS_V3_ACL=y | ||
90 | CONFIG_NFS_V4=y | ||
91 | CONFIG_NLS_DEFAULT="n" | ||
92 | CONFIG_MAGIC_SYSRQ=y | ||
93 | CONFIG_DEBUG_FS=y | ||
94 | CONFIG_DEBUG_KERNEL=y | ||
95 | CONFIG_DETECT_HUNG_TASK=y | ||
96 | CONFIG_DEBUG_INFO=y | ||
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
98 | CONFIG_XMON=y | ||
99 | CONFIG_XMON_DEFAULT=y | ||
100 | CONFIG_PPC_EARLY_DEBUG=y | ||
101 | CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0x10000000 | ||
102 | CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x200 | ||
103 | CONFIG_CRYPTO=y | ||
104 | CONFIG_CRYPTO_CBC=y | ||
105 | CONFIG_CRYPTO_ECB=y | ||
106 | CONFIG_CRYPTO_PCBC=y | ||
107 | CONFIG_CRYPTO_MD5=y | ||
108 | CONFIG_CRYPTO_DES=y | ||
109 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
110 | # CONFIG_CRYPTO_HW is not set | ||
diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig index a6eb6ad05b2..ca00cf750d3 100644 --- a/arch/powerpc/configs/44x/iss476-smp_defconfig +++ b/arch/powerpc/configs/44x/iss476-smp_defconfig | |||
@@ -25,7 +25,8 @@ CONFIG_CMDLINE_BOOL=y | |||
25 | CONFIG_CMDLINE="root=/dev/issblk0" | 25 | CONFIG_CMDLINE="root=/dev/issblk0" |
26 | # CONFIG_PCI is not set | 26 | # CONFIG_PCI is not set |
27 | CONFIG_ADVANCED_OPTIONS=y | 27 | CONFIG_ADVANCED_OPTIONS=y |
28 | CONFIG_RELOCATABLE=y | 28 | CONFIG_NONSTATIC_KERNEL=y |
29 | CONFIG_DYNAMIC_MEMSTART=y | ||
29 | CONFIG_NET=y | 30 | CONFIG_NET=y |
30 | CONFIG_PACKET=y | 31 | CONFIG_PACKET=y |
31 | CONFIG_UNIX=y | 32 | CONFIG_UNIX=y |
diff --git a/arch/powerpc/configs/chroma_defconfig b/arch/powerpc/configs/chroma_defconfig new file mode 100644 index 00000000000..acf7fb28046 --- /dev/null +++ b/arch/powerpc/configs/chroma_defconfig | |||
@@ -0,0 +1,307 @@ | |||
1 | CONFIG_PPC64=y | ||
2 | CONFIG_PPC_BOOK3E_64=y | ||
3 | # CONFIG_VIRT_CPU_ACCOUNTING is not set | ||
4 | CONFIG_SMP=y | ||
5 | CONFIG_NR_CPUS=256 | ||
6 | CONFIG_EXPERIMENTAL=y | ||
7 | CONFIG_SYSVIPC=y | ||
8 | CONFIG_POSIX_MQUEUE=y | ||
9 | CONFIG_BSD_PROCESS_ACCT=y | ||
10 | CONFIG_TASKSTATS=y | ||
11 | CONFIG_TASK_DELAY_ACCT=y | ||
12 | CONFIG_TASK_XACCT=y | ||
13 | CONFIG_TASK_IO_ACCOUNTING=y | ||
14 | CONFIG_AUDIT=y | ||
15 | CONFIG_AUDITSYSCALL=y | ||
16 | CONFIG_IKCONFIG=y | ||
17 | CONFIG_IKCONFIG_PROC=y | ||
18 | CONFIG_LOG_BUF_SHIFT=19 | ||
19 | CONFIG_CGROUPS=y | ||
20 | CONFIG_CGROUP_DEVICE=y | ||
21 | CONFIG_CPUSETS=y | ||
22 | CONFIG_CGROUP_CPUACCT=y | ||
23 | CONFIG_RESOURCE_COUNTERS=y | ||
24 | CONFIG_CGROUP_MEM_RES_CTLR=y | ||
25 | CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y | ||
26 | CONFIG_NAMESPACES=y | ||
27 | CONFIG_RELAY=y | ||
28 | CONFIG_BLK_DEV_INITRD=y | ||
29 | CONFIG_INITRAMFS_SOURCE="" | ||
30 | CONFIG_RD_BZIP2=y | ||
31 | CONFIG_RD_LZMA=y | ||
32 | CONFIG_INITRAMFS_COMPRESSION_GZIP=y | ||
33 | CONFIG_KALLSYMS_ALL=y | ||
34 | CONFIG_EMBEDDED=y | ||
35 | CONFIG_PERF_COUNTERS=y | ||
36 | CONFIG_PROFILING=y | ||
37 | CONFIG_OPROFILE=y | ||
38 | CONFIG_KPROBES=y | ||
39 | CONFIG_MODULES=y | ||
40 | CONFIG_MODULE_FORCE_LOAD=y | ||
41 | CONFIG_MODULE_UNLOAD=y | ||
42 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
43 | CONFIG_MODVERSIONS=y | ||
44 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
45 | CONFIG_SCOM_DEBUGFS=y | ||
46 | CONFIG_PPC_A2_DD2=y | ||
47 | CONFIG_KVM_GUEST=y | ||
48 | CONFIG_NO_HZ=y | ||
49 | CONFIG_HIGH_RES_TIMERS=y | ||
50 | CONFIG_HZ_100=y | ||
51 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
52 | CONFIG_BINFMT_MISC=y | ||
53 | CONFIG_NUMA=y | ||
54 | # CONFIG_MIGRATION is not set | ||
55 | CONFIG_PPC_64K_PAGES=y | ||
56 | CONFIG_SCHED_SMT=y | ||
57 | CONFIG_CMDLINE_BOOL=y | ||
58 | CONFIG_CMDLINE="" | ||
59 | # CONFIG_SECCOMP is not set | ||
60 | CONFIG_PCIEPORTBUS=y | ||
61 | # CONFIG_PCIEASPM is not set | ||
62 | CONFIG_PCI_MSI=y | ||
63 | CONFIG_PACKET=y | ||
64 | CONFIG_UNIX=y | ||
65 | CONFIG_XFRM_USER=m | ||
66 | CONFIG_XFRM_SUB_POLICY=y | ||
67 | CONFIG_XFRM_STATISTICS=y | ||
68 | CONFIG_NET_KEY=m | ||
69 | CONFIG_NET_KEY_MIGRATE=y | ||
70 | CONFIG_INET=y | ||
71 | CONFIG_IP_MULTICAST=y | ||
72 | CONFIG_IP_ADVANCED_ROUTER=y | ||
73 | CONFIG_IP_ROUTE_MULTIPATH=y | ||
74 | CONFIG_IP_ROUTE_VERBOSE=y | ||
75 | CONFIG_IP_PNP=y | ||
76 | CONFIG_IP_PNP_DHCP=y | ||
77 | CONFIG_IP_PNP_BOOTP=y | ||
78 | CONFIG_NET_IPIP=y | ||
79 | CONFIG_IP_MROUTE=y | ||
80 | CONFIG_IP_PIMSM_V1=y | ||
81 | CONFIG_IP_PIMSM_V2=y | ||
82 | CONFIG_SYN_COOKIES=y | ||
83 | CONFIG_INET_AH=m | ||
84 | CONFIG_INET_ESP=m | ||
85 | CONFIG_INET_IPCOMP=m | ||
86 | CONFIG_IPV6=y | ||
87 | CONFIG_IPV6_PRIVACY=y | ||
88 | CONFIG_IPV6_ROUTER_PREF=y | ||
89 | CONFIG_IPV6_ROUTE_INFO=y | ||
90 | CONFIG_IPV6_OPTIMISTIC_DAD=y | ||
91 | CONFIG_INET6_AH=y | ||
92 | CONFIG_INET6_ESP=y | ||
93 | CONFIG_INET6_IPCOMP=y | ||
94 | CONFIG_IPV6_MIP6=y | ||
95 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=y | ||
96 | CONFIG_IPV6_TUNNEL=y | ||
97 | CONFIG_IPV6_MULTIPLE_TABLES=y | ||
98 | CONFIG_IPV6_SUBTREES=y | ||
99 | CONFIG_IPV6_MROUTE=y | ||
100 | CONFIG_IPV6_PIMSM_V2=y | ||
101 | CONFIG_NETFILTER=y | ||
102 | CONFIG_NF_CONNTRACK=m | ||
103 | CONFIG_NF_CONNTRACK_EVENTS=y | ||
104 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
105 | CONFIG_NF_CONNTRACK_FTP=m | ||
106 | CONFIG_NF_CONNTRACK_IRC=m | ||
107 | CONFIG_NF_CONNTRACK_TFTP=m | ||
108 | CONFIG_NF_CT_NETLINK=m | ||
109 | CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
110 | CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
111 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
112 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
113 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
114 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
115 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | ||
116 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | ||
117 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
118 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | ||
119 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
120 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | ||
121 | CONFIG_NETFILTER_XT_MATCH_DSCP=m | ||
122 | CONFIG_NETFILTER_XT_MATCH_ESP=m | ||
123 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | ||
124 | CONFIG_NETFILTER_XT_MATCH_HELPER=m | ||
125 | CONFIG_NETFILTER_XT_MATCH_IPRANGE=m | ||
126 | CONFIG_NETFILTER_XT_MATCH_LENGTH=m | ||
127 | CONFIG_NETFILTER_XT_MATCH_LIMIT=m | ||
128 | CONFIG_NETFILTER_XT_MATCH_MAC=m | ||
129 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
130 | CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m | ||
131 | CONFIG_NETFILTER_XT_MATCH_OWNER=m | ||
132 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
133 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m | ||
134 | CONFIG_NETFILTER_XT_MATCH_QUOTA=m | ||
135 | CONFIG_NETFILTER_XT_MATCH_RATEEST=m | ||
136 | CONFIG_NETFILTER_XT_MATCH_REALM=m | ||
137 | CONFIG_NETFILTER_XT_MATCH_RECENT=m | ||
138 | CONFIG_NETFILTER_XT_MATCH_SCTP=m | ||
139 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
140 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | ||
141 | CONFIG_NETFILTER_XT_MATCH_STRING=m | ||
142 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | ||
143 | CONFIG_NETFILTER_XT_MATCH_TIME=m | ||
144 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
145 | CONFIG_NF_CONNTRACK_IPV4=m | ||
146 | CONFIG_IP_NF_QUEUE=m | ||
147 | CONFIG_IP_NF_IPTABLES=m | ||
148 | CONFIG_IP_NF_MATCH_AH=m | ||
149 | CONFIG_IP_NF_MATCH_ECN=m | ||
150 | CONFIG_IP_NF_MATCH_TTL=m | ||
151 | CONFIG_IP_NF_FILTER=m | ||
152 | CONFIG_IP_NF_TARGET_REJECT=m | ||
153 | CONFIG_IP_NF_TARGET_LOG=m | ||
154 | CONFIG_IP_NF_TARGET_ULOG=m | ||
155 | CONFIG_NF_NAT=m | ||
156 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
157 | CONFIG_IP_NF_TARGET_NETMAP=m | ||
158 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
159 | CONFIG_NET_TCPPROBE=y | ||
160 | # CONFIG_WIRELESS is not set | ||
161 | CONFIG_NET_9P=y | ||
162 | CONFIG_NET_9P_DEBUG=y | ||
163 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
164 | CONFIG_DEVTMPFS=y | ||
165 | CONFIG_MTD=y | ||
166 | CONFIG_MTD_CHAR=y | ||
167 | CONFIG_MTD_BLOCK=y | ||
168 | CONFIG_MTD_CFI=y | ||
169 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
170 | CONFIG_MTD_CFI_LE_BYTE_SWAP=y | ||
171 | CONFIG_MTD_CFI_INTELEXT=y | ||
172 | CONFIG_MTD_CFI_AMDSTD=y | ||
173 | CONFIG_MTD_CFI_STAA=y | ||
174 | CONFIG_MTD_PHYSMAP_OF=y | ||
175 | CONFIG_PROC_DEVICETREE=y | ||
176 | CONFIG_BLK_DEV_LOOP=y | ||
177 | CONFIG_BLK_DEV_CRYPTOLOOP=y | ||
178 | CONFIG_BLK_DEV_NBD=m | ||
179 | CONFIG_BLK_DEV_RAM=y | ||
180 | CONFIG_BLK_DEV_RAM_SIZE=65536 | ||
181 | CONFIG_CDROM_PKTCDVD=y | ||
182 | CONFIG_MISC_DEVICES=y | ||
183 | CONFIG_BLK_DEV_SD=y | ||
184 | CONFIG_BLK_DEV_SR=y | ||
185 | CONFIG_BLK_DEV_SR_VENDOR=y | ||
186 | CONFIG_CHR_DEV_SG=y | ||
187 | CONFIG_SCSI_MULTI_LUN=y | ||
188 | CONFIG_SCSI_CONSTANTS=y | ||
189 | CONFIG_SCSI_SPI_ATTRS=y | ||
190 | CONFIG_SCSI_FC_ATTRS=y | ||
191 | CONFIG_SCSI_ISCSI_ATTRS=m | ||
192 | CONFIG_SCSI_SAS_ATTRS=m | ||
193 | CONFIG_SCSI_SRP_ATTRS=y | ||
194 | CONFIG_ATA=y | ||
195 | CONFIG_SATA_AHCI=y | ||
196 | CONFIG_SATA_SIL24=y | ||
197 | CONFIG_SATA_MV=y | ||
198 | CONFIG_SATA_SIL=y | ||
199 | CONFIG_PATA_CMD64X=y | ||
200 | CONFIG_PATA_MARVELL=y | ||
201 | CONFIG_PATA_SIL680=y | ||
202 | CONFIG_MD=y | ||
203 | CONFIG_BLK_DEV_MD=y | ||
204 | CONFIG_MD_LINEAR=y | ||
205 | CONFIG_BLK_DEV_DM=y | ||
206 | CONFIG_DM_CRYPT=y | ||
207 | CONFIG_DM_SNAPSHOT=y | ||
208 | CONFIG_DM_MIRROR=y | ||
209 | CONFIG_DM_ZERO=y | ||
210 | CONFIG_DM_UEVENT=y | ||
211 | CONFIG_NETDEVICES=y | ||
212 | CONFIG_TUN=y | ||
213 | CONFIG_E1000E=y | ||
214 | CONFIG_TIGON3=y | ||
215 | # CONFIG_WLAN is not set | ||
216 | # CONFIG_INPUT is not set | ||
217 | # CONFIG_SERIO is not set | ||
218 | # CONFIG_VT is not set | ||
219 | CONFIG_DEVPTS_MULTIPLE_INSTANCES=y | ||
220 | CONFIG_SERIAL_8250=y | ||
221 | CONFIG_SERIAL_8250_CONSOLE=y | ||
222 | CONFIG_HW_RANDOM=y | ||
223 | CONFIG_RAW_DRIVER=y | ||
224 | CONFIG_MAX_RAW_DEVS=1024 | ||
225 | # CONFIG_HWMON is not set | ||
226 | # CONFIG_VGA_ARB is not set | ||
227 | # CONFIG_USB_SUPPORT is not set | ||
228 | CONFIG_EDAC=y | ||
229 | CONFIG_EDAC_MM_EDAC=y | ||
230 | CONFIG_RTC_CLASS=y | ||
231 | CONFIG_RTC_DRV_DS1511=y | ||
232 | CONFIG_RTC_DRV_DS1553=y | ||
233 | CONFIG_EXT2_FS=y | ||
234 | CONFIG_EXT2_FS_XATTR=y | ||
235 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
236 | CONFIG_EXT2_FS_SECURITY=y | ||
237 | CONFIG_EXT2_FS_XIP=y | ||
238 | CONFIG_EXT3_FS=y | ||
239 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
240 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
241 | CONFIG_EXT3_FS_SECURITY=y | ||
242 | CONFIG_EXT4_FS=y | ||
243 | # CONFIG_DNOTIFY is not set | ||
244 | CONFIG_FUSE_FS=y | ||
245 | CONFIG_ISO9660_FS=y | ||
246 | CONFIG_JOLIET=y | ||
247 | CONFIG_ZISOFS=y | ||
248 | CONFIG_UDF_FS=m | ||
249 | CONFIG_MSDOS_FS=y | ||
250 | CONFIG_VFAT_FS=y | ||
251 | CONFIG_PROC_KCORE=y | ||
252 | CONFIG_TMPFS=y | ||
253 | CONFIG_TMPFS_POSIX_ACL=y | ||
254 | CONFIG_CONFIGFS_FS=m | ||
255 | CONFIG_CRAMFS=y | ||
256 | CONFIG_NFS_FS=y | ||
257 | CONFIG_NFS_V3=y | ||
258 | CONFIG_NFS_V3_ACL=y | ||
259 | CONFIG_NFS_V4=y | ||
260 | CONFIG_NFS_V4_1=y | ||
261 | CONFIG_ROOT_NFS=y | ||
262 | CONFIG_CIFS=y | ||
263 | CONFIG_CIFS_WEAK_PW_HASH=y | ||
264 | CONFIG_CIFS_XATTR=y | ||
265 | CONFIG_CIFS_POSIX=y | ||
266 | CONFIG_NLS_CODEPAGE_437=y | ||
267 | CONFIG_NLS_ASCII=y | ||
268 | CONFIG_NLS_ISO8859_1=y | ||
269 | CONFIG_CRC_CCITT=m | ||
270 | CONFIG_CRC_T10DIF=y | ||
271 | CONFIG_LIBCRC32C=m | ||
272 | CONFIG_PRINTK_TIME=y | ||
273 | CONFIG_MAGIC_SYSRQ=y | ||
274 | CONFIG_STRIP_ASM_SYMS=y | ||
275 | CONFIG_DETECT_HUNG_TASK=y | ||
276 | # CONFIG_SCHED_DEBUG is not set | ||
277 | CONFIG_DEBUG_INFO=y | ||
278 | CONFIG_FTRACE_SYSCALLS=y | ||
279 | CONFIG_PPC_EMULATED_STATS=y | ||
280 | CONFIG_XMON=y | ||
281 | CONFIG_XMON_DEFAULT=y | ||
282 | CONFIG_VIRQ_DEBUG=y | ||
283 | CONFIG_PPC_EARLY_DEBUG=y | ||
284 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
285 | CONFIG_CRYPTO_NULL=m | ||
286 | CONFIG_CRYPTO_TEST=m | ||
287 | CONFIG_CRYPTO_CCM=m | ||
288 | CONFIG_CRYPTO_GCM=m | ||
289 | CONFIG_CRYPTO_PCBC=m | ||
290 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
291 | CONFIG_CRYPTO_SHA256=m | ||
292 | CONFIG_CRYPTO_SHA512=m | ||
293 | CONFIG_CRYPTO_TGR192=m | ||
294 | CONFIG_CRYPTO_WP512=m | ||
295 | CONFIG_CRYPTO_AES=m | ||
296 | CONFIG_CRYPTO_ANUBIS=m | ||
297 | CONFIG_CRYPTO_BLOWFISH=m | ||
298 | CONFIG_CRYPTO_CAST5=m | ||
299 | CONFIG_CRYPTO_CAST6=m | ||
300 | CONFIG_CRYPTO_KHAZAD=m | ||
301 | CONFIG_CRYPTO_SALSA20=m | ||
302 | CONFIG_CRYPTO_SERPENT=m | ||
303 | CONFIG_CRYPTO_TEA=m | ||
304 | CONFIG_CRYPTO_TWOFISH=m | ||
305 | CONFIG_CRYPTO_LZO=m | ||
306 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
307 | CONFIG_VIRTUALIZATION=y | ||
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index f087de6ec03..f8aef205d22 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig | |||
@@ -37,6 +37,8 @@ CONFIG_FSL_LBC=y | |||
37 | CONFIG_PCI=y | 37 | CONFIG_PCI=y |
38 | CONFIG_PCIEPORTBUS=y | 38 | CONFIG_PCIEPORTBUS=y |
39 | # CONFIG_PCIEASPM is not set | 39 | # CONFIG_PCIEASPM is not set |
40 | CONFIG_RAPIDIO=y | ||
41 | CONFIG_FSL_RIO=y | ||
40 | CONFIG_NET=y | 42 | CONFIG_NET=y |
41 | CONFIG_PACKET=y | 43 | CONFIG_PACKET=y |
42 | CONFIG_UNIX=y | 44 | CONFIG_UNIX=y |
@@ -94,17 +96,17 @@ CONFIG_SATA_SIL24=y | |||
94 | CONFIG_SATA_SIL=y | 96 | CONFIG_SATA_SIL=y |
95 | CONFIG_PATA_SIL680=y | 97 | CONFIG_PATA_SIL680=y |
96 | CONFIG_NETDEVICES=y | 98 | CONFIG_NETDEVICES=y |
97 | CONFIG_VITESSE_PHY=y | 99 | CONFIG_FSL_PQ_MDIO=y |
98 | CONFIG_FIXED_PHY=y | ||
99 | CONFIG_NET_ETHERNET=y | ||
100 | CONFIG_E1000=y | 100 | CONFIG_E1000=y |
101 | CONFIG_E1000E=y | 101 | CONFIG_E1000E=y |
102 | CONFIG_FSL_PQ_MDIO=y | 102 | CONFIG_VITESSE_PHY=y |
103 | CONFIG_FIXED_PHY=y | ||
103 | # CONFIG_INPUT_MOUSEDEV is not set | 104 | # CONFIG_INPUT_MOUSEDEV is not set |
104 | # CONFIG_INPUT_KEYBOARD is not set | 105 | # CONFIG_INPUT_KEYBOARD is not set |
105 | # CONFIG_INPUT_MOUSE is not set | 106 | # CONFIG_INPUT_MOUSE is not set |
106 | CONFIG_SERIO_LIBPS2=y | 107 | CONFIG_SERIO_LIBPS2=y |
107 | # CONFIG_LEGACY_PTYS is not set | 108 | # CONFIG_LEGACY_PTYS is not set |
109 | CONFIG_PPC_EPAPR_HV_BYTECHAN=y | ||
108 | CONFIG_SERIAL_8250=y | 110 | CONFIG_SERIAL_8250=y |
109 | CONFIG_SERIAL_8250_CONSOLE=y | 111 | CONFIG_SERIAL_8250_CONSOLE=y |
110 | CONFIG_SERIAL_8250_EXTENDED=y | 112 | CONFIG_SERIAL_8250_EXTENDED=y |
@@ -155,6 +157,7 @@ CONFIG_VFAT_FS=y | |||
155 | CONFIG_NTFS_FS=y | 157 | CONFIG_NTFS_FS=y |
156 | CONFIG_PROC_KCORE=y | 158 | CONFIG_PROC_KCORE=y |
157 | CONFIG_TMPFS=y | 159 | CONFIG_TMPFS=y |
160 | CONFIG_HUGETLBFS=y | ||
158 | CONFIG_JFFS2_FS=y | 161 | CONFIG_JFFS2_FS=y |
159 | CONFIG_CRAMFS=y | 162 | CONFIG_CRAMFS=y |
160 | CONFIG_NFS_FS=y | 163 | CONFIG_NFS_FS=y |
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index 782822c32d1..7ed8d4cf271 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig | |||
@@ -23,6 +23,8 @@ CONFIG_P5020_DS=y | |||
23 | CONFIG_NO_HZ=y | 23 | CONFIG_NO_HZ=y |
24 | CONFIG_HIGH_RES_TIMERS=y | 24 | CONFIG_HIGH_RES_TIMERS=y |
25 | CONFIG_BINFMT_MISC=m | 25 | CONFIG_BINFMT_MISC=m |
26 | CONFIG_RAPIDIO=y | ||
27 | CONFIG_FSL_RIO=y | ||
26 | CONFIG_NET=y | 28 | CONFIG_NET=y |
27 | CONFIG_PACKET=y | 29 | CONFIG_PACKET=y |
28 | CONFIG_UNIX=y | 30 | CONFIG_UNIX=y |
@@ -57,7 +59,6 @@ CONFIG_MISC_DEVICES=y | |||
57 | CONFIG_EEPROM_LEGACY=y | 59 | CONFIG_EEPROM_LEGACY=y |
58 | CONFIG_NETDEVICES=y | 60 | CONFIG_NETDEVICES=y |
59 | CONFIG_DUMMY=y | 61 | CONFIG_DUMMY=y |
60 | CONFIG_NET_ETHERNET=y | ||
61 | CONFIG_INPUT_FF_MEMLESS=m | 62 | CONFIG_INPUT_FF_MEMLESS=m |
62 | # CONFIG_INPUT_MOUSEDEV is not set | 63 | # CONFIG_INPUT_MOUSEDEV is not set |
63 | # CONFIG_INPUT_KEYBOARD is not set | 64 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -81,6 +82,7 @@ CONFIG_EXT3_FS=y | |||
81 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 82 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
82 | CONFIG_PROC_KCORE=y | 83 | CONFIG_PROC_KCORE=y |
83 | CONFIG_TMPFS=y | 84 | CONFIG_TMPFS=y |
85 | CONFIG_HUGETLBFS=y | ||
84 | # CONFIG_MISC_FILESYSTEMS is not set | 86 | # CONFIG_MISC_FILESYSTEMS is not set |
85 | CONFIG_PARTITION_ADVANCED=y | 87 | CONFIG_PARTITION_ADVANCED=y |
86 | CONFIG_MAC_PARTITION=y | 88 | CONFIG_MAC_PARTITION=y |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index a1e5a178a4a..f37a2ab4888 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
@@ -1,5 +1,4 @@ | |||
1 | CONFIG_PPC_85xx=y | 1 | CONFIG_PPC_85xx=y |
2 | CONFIG_PHYS_64BIT=y | ||
3 | CONFIG_EXPERIMENTAL=y | 2 | CONFIG_EXPERIMENTAL=y |
4 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
5 | CONFIG_POSIX_MQUEUE=y | 4 | CONFIG_POSIX_MQUEUE=y |
@@ -93,15 +92,14 @@ CONFIG_SATA_FSL=y | |||
93 | CONFIG_PATA_ALI=y | 92 | CONFIG_PATA_ALI=y |
94 | CONFIG_NETDEVICES=y | 93 | CONFIG_NETDEVICES=y |
95 | CONFIG_DUMMY=y | 94 | CONFIG_DUMMY=y |
95 | CONFIG_FS_ENET=y | ||
96 | CONFIG_UCC_GETH=y | ||
97 | CONFIG_GIANFAR=y | ||
96 | CONFIG_MARVELL_PHY=y | 98 | CONFIG_MARVELL_PHY=y |
97 | CONFIG_DAVICOM_PHY=y | 99 | CONFIG_DAVICOM_PHY=y |
98 | CONFIG_CICADA_PHY=y | 100 | CONFIG_CICADA_PHY=y |
99 | CONFIG_VITESSE_PHY=y | 101 | CONFIG_VITESSE_PHY=y |
100 | CONFIG_FIXED_PHY=y | 102 | CONFIG_FIXED_PHY=y |
101 | CONFIG_NET_ETHERNET=y | ||
102 | CONFIG_FS_ENET=y | ||
103 | CONFIG_GIANFAR=y | ||
104 | CONFIG_UCC_GETH=y | ||
105 | CONFIG_INPUT_FF_MEMLESS=m | 103 | CONFIG_INPUT_FF_MEMLESS=m |
106 | # CONFIG_INPUT_MOUSEDEV is not set | 104 | # CONFIG_INPUT_MOUSEDEV is not set |
107 | # CONFIG_INPUT_KEYBOARD is not set | 105 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -120,6 +118,9 @@ CONFIG_NVRAM=y | |||
120 | CONFIG_I2C=y | 118 | CONFIG_I2C=y |
121 | CONFIG_I2C_CPM=m | 119 | CONFIG_I2C_CPM=m |
122 | CONFIG_I2C_MPC=y | 120 | CONFIG_I2C_MPC=y |
121 | CONFIG_SPI=y | ||
122 | CONFIG_SPI_FSL_SPI=y | ||
123 | CONFIG_SPI_FSL_ESPI=y | ||
123 | CONFIG_GPIO_MPC8XXX=y | 124 | CONFIG_GPIO_MPC8XXX=y |
124 | # CONFIG_HWMON is not set | 125 | # CONFIG_HWMON is not set |
125 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 126 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
@@ -163,6 +164,10 @@ CONFIG_USB_OHCI_HCD=y | |||
163 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 164 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
164 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 165 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
165 | CONFIG_USB_STORAGE=y | 166 | CONFIG_USB_STORAGE=y |
167 | CONFIG_MMC=y | ||
168 | CONFIG_MMC_SDHCI=y | ||
169 | CONFIG_MMC_SDHCI_PLTFM=y | ||
170 | CONFIG_MMC_SDHCI_OF_ESDHC=y | ||
166 | CONFIG_EDAC=y | 171 | CONFIG_EDAC=y |
167 | CONFIG_EDAC_MM_EDAC=y | 172 | CONFIG_EDAC_MM_EDAC=y |
168 | CONFIG_RTC_CLASS=y | 173 | CONFIG_RTC_CLASS=y |
@@ -182,6 +187,7 @@ CONFIG_VFAT_FS=y | |||
182 | CONFIG_NTFS_FS=y | 187 | CONFIG_NTFS_FS=y |
183 | CONFIG_PROC_KCORE=y | 188 | CONFIG_PROC_KCORE=y |
184 | CONFIG_TMPFS=y | 189 | CONFIG_TMPFS=y |
190 | CONFIG_HUGETLBFS=y | ||
185 | CONFIG_ADFS_FS=m | 191 | CONFIG_ADFS_FS=m |
186 | CONFIG_AFFS_FS=m | 192 | CONFIG_AFFS_FS=m |
187 | CONFIG_HFS_FS=m | 193 | CONFIG_HFS_FS=m |
@@ -213,4 +219,5 @@ CONFIG_CRYPTO_SHA256=y | |||
213 | CONFIG_CRYPTO_SHA512=y | 219 | CONFIG_CRYPTO_SHA512=y |
214 | CONFIG_CRYPTO_AES=y | 220 | CONFIG_CRYPTO_AES=y |
215 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 221 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
222 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
216 | CONFIG_CRYPTO_DEV_TALITOS=y | 223 | CONFIG_CRYPTO_DEV_TALITOS=y |
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index dd1e41386c4..abdcd317cda 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
@@ -1,5 +1,4 @@ | |||
1 | CONFIG_PPC_85xx=y | 1 | CONFIG_PPC_85xx=y |
2 | CONFIG_PHYS_64BIT=y | ||
3 | CONFIG_SMP=y | 2 | CONFIG_SMP=y |
4 | CONFIG_NR_CPUS=8 | 3 | CONFIG_NR_CPUS=8 |
5 | CONFIG_EXPERIMENTAL=y | 4 | CONFIG_EXPERIMENTAL=y |
@@ -26,6 +25,7 @@ CONFIG_MPC85xx_MDS=y | |||
26 | CONFIG_MPC8536_DS=y | 25 | CONFIG_MPC8536_DS=y |
27 | CONFIG_MPC85xx_DS=y | 26 | CONFIG_MPC85xx_DS=y |
28 | CONFIG_MPC85xx_RDB=y | 27 | CONFIG_MPC85xx_RDB=y |
28 | CONFIG_P1010_RDB=y | ||
29 | CONFIG_P1022_DS=y | 29 | CONFIG_P1022_DS=y |
30 | CONFIG_P1023_RDS=y | 30 | CONFIG_P1023_RDS=y |
31 | CONFIG_SOCRATES=y | 31 | CONFIG_SOCRATES=y |
@@ -94,15 +94,14 @@ CONFIG_SATA_FSL=y | |||
94 | CONFIG_PATA_ALI=y | 94 | CONFIG_PATA_ALI=y |
95 | CONFIG_NETDEVICES=y | 95 | CONFIG_NETDEVICES=y |
96 | CONFIG_DUMMY=y | 96 | CONFIG_DUMMY=y |
97 | CONFIG_FS_ENET=y | ||
98 | CONFIG_UCC_GETH=y | ||
99 | CONFIG_GIANFAR=y | ||
97 | CONFIG_MARVELL_PHY=y | 100 | CONFIG_MARVELL_PHY=y |
98 | CONFIG_DAVICOM_PHY=y | 101 | CONFIG_DAVICOM_PHY=y |
99 | CONFIG_CICADA_PHY=y | 102 | CONFIG_CICADA_PHY=y |
100 | CONFIG_VITESSE_PHY=y | 103 | CONFIG_VITESSE_PHY=y |
101 | CONFIG_FIXED_PHY=y | 104 | CONFIG_FIXED_PHY=y |
102 | CONFIG_NET_ETHERNET=y | ||
103 | CONFIG_FS_ENET=y | ||
104 | CONFIG_GIANFAR=y | ||
105 | CONFIG_UCC_GETH=y | ||
106 | CONFIG_INPUT_FF_MEMLESS=m | 105 | CONFIG_INPUT_FF_MEMLESS=m |
107 | # CONFIG_INPUT_MOUSEDEV is not set | 106 | # CONFIG_INPUT_MOUSEDEV is not set |
108 | # CONFIG_INPUT_KEYBOARD is not set | 107 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -121,6 +120,9 @@ CONFIG_NVRAM=y | |||
121 | CONFIG_I2C=y | 120 | CONFIG_I2C=y |
122 | CONFIG_I2C_CPM=m | 121 | CONFIG_I2C_CPM=m |
123 | CONFIG_I2C_MPC=y | 122 | CONFIG_I2C_MPC=y |
123 | CONFIG_SPI=y | ||
124 | CONFIG_SPI_FSL_SPI=y | ||
125 | CONFIG_SPI_FSL_ESPI=y | ||
124 | CONFIG_GPIO_MPC8XXX=y | 126 | CONFIG_GPIO_MPC8XXX=y |
125 | # CONFIG_HWMON is not set | 127 | # CONFIG_HWMON is not set |
126 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 128 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
@@ -164,6 +166,10 @@ CONFIG_USB_OHCI_HCD=y | |||
164 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 166 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
165 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y | 167 | CONFIG_USB_OHCI_HCD_PPC_OF_LE=y |
166 | CONFIG_USB_STORAGE=y | 168 | CONFIG_USB_STORAGE=y |
169 | CONFIG_MMC=y | ||
170 | CONFIG_MMC_SDHCI=y | ||
171 | CONFIG_MMC_SDHCI_PLTFM=y | ||
172 | CONFIG_MMC_SDHCI_OF_ESDHC=y | ||
167 | CONFIG_EDAC=y | 173 | CONFIG_EDAC=y |
168 | CONFIG_EDAC_MM_EDAC=y | 174 | CONFIG_EDAC_MM_EDAC=y |
169 | CONFIG_RTC_CLASS=y | 175 | CONFIG_RTC_CLASS=y |
@@ -183,6 +189,7 @@ CONFIG_VFAT_FS=y | |||
183 | CONFIG_NTFS_FS=y | 189 | CONFIG_NTFS_FS=y |
184 | CONFIG_PROC_KCORE=y | 190 | CONFIG_PROC_KCORE=y |
185 | CONFIG_TMPFS=y | 191 | CONFIG_TMPFS=y |
192 | CONFIG_HUGETLBFS=y | ||
186 | CONFIG_ADFS_FS=m | 193 | CONFIG_ADFS_FS=m |
187 | CONFIG_AFFS_FS=m | 194 | CONFIG_AFFS_FS=m |
188 | CONFIG_HFS_FS=m | 195 | CONFIG_HFS_FS=m |
@@ -214,4 +221,5 @@ CONFIG_CRYPTO_SHA256=y | |||
214 | CONFIG_CRYPTO_SHA512=y | 221 | CONFIG_CRYPTO_SHA512=y |
215 | CONFIG_CRYPTO_AES=y | 222 | CONFIG_CRYPTO_AES=y |
216 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 223 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
224 | CONFIG_CRYPTO_DEV_FSL_CAAM=y | ||
217 | CONFIG_CRYPTO_DEV_TALITOS=y | 225 | CONFIG_CRYPTO_DEV_TALITOS=y |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 535711fcb13..2156e077859 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -390,6 +390,11 @@ CONFIG_HUGETLBFS=y | |||
390 | CONFIG_HFS_FS=m | 390 | CONFIG_HFS_FS=m |
391 | CONFIG_HFSPLUS_FS=m | 391 | CONFIG_HFSPLUS_FS=m |
392 | CONFIG_CRAMFS=m | 392 | CONFIG_CRAMFS=m |
393 | CONFIG_SQUASHFS=m | ||
394 | CONFIG_SQUASHFS_XATTR=y | ||
395 | CONFIG_SQUASHFS_ZLIB=y | ||
396 | CONFIG_SQUASHFS_LZO=y | ||
397 | CONFIG_SQUASHFS_XZ=y | ||
393 | CONFIG_NFS_FS=y | 398 | CONFIG_NFS_FS=y |
394 | CONFIG_NFS_V3=y | 399 | CONFIG_NFS_V3=y |
395 | CONFIG_NFS_V3_ACL=y | 400 | CONFIG_NFS_V3_ACL=y |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 185c292b0f1..ded867871e9 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
@@ -6,10 +6,10 @@ CONFIG_NR_CPUS=2 | |||
6 | CONFIG_EXPERIMENTAL=y | 6 | CONFIG_EXPERIMENTAL=y |
7 | CONFIG_SYSVIPC=y | 7 | CONFIG_SYSVIPC=y |
8 | CONFIG_POSIX_MQUEUE=y | 8 | CONFIG_POSIX_MQUEUE=y |
9 | CONFIG_NAMESPACES=y | 9 | CONFIG_SPARSE_IRQ=y |
10 | CONFIG_BLK_DEV_INITRD=y | 10 | CONFIG_BLK_DEV_INITRD=y |
11 | CONFIG_EXPERT=y | 11 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
12 | CONFIG_KALLSYMS_EXTRA_PASS=y | 12 | CONFIG_EMBEDDED=y |
13 | # CONFIG_PERF_EVENTS is not set | 13 | # CONFIG_PERF_EVENTS is not set |
14 | # CONFIG_COMPAT_BRK is not set | 14 | # CONFIG_COMPAT_BRK is not set |
15 | CONFIG_SLAB=y | 15 | CONFIG_SLAB=y |
@@ -17,6 +17,7 @@ CONFIG_PROFILING=y | |||
17 | CONFIG_OPROFILE=m | 17 | CONFIG_OPROFILE=m |
18 | CONFIG_MODULES=y | 18 | CONFIG_MODULES=y |
19 | CONFIG_MODULE_UNLOAD=y | 19 | CONFIG_MODULE_UNLOAD=y |
20 | # CONFIG_PPC_POWERNV is not set | ||
20 | # CONFIG_PPC_PSERIES is not set | 21 | # CONFIG_PPC_PSERIES is not set |
21 | # CONFIG_PPC_PMAC is not set | 22 | # CONFIG_PPC_PMAC is not set |
22 | CONFIG_PPC_PS3=y | 23 | CONFIG_PPC_PS3=y |
@@ -27,14 +28,14 @@ CONFIG_PS3_VRAM=m | |||
27 | CONFIG_PS3_LPM=m | 28 | CONFIG_PS3_LPM=m |
28 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set | 29 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set |
29 | CONFIG_HIGH_RES_TIMERS=y | 30 | CONFIG_HIGH_RES_TIMERS=y |
31 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
30 | CONFIG_BINFMT_MISC=y | 32 | CONFIG_BINFMT_MISC=y |
31 | CONFIG_KEXEC=y | 33 | CONFIG_KEXEC=y |
32 | CONFIG_SPARSE_IRQ=y | ||
33 | # CONFIG_SPARSEMEM_VMEMMAP is not set | 34 | # CONFIG_SPARSEMEM_VMEMMAP is not set |
34 | CONFIG_SCHED_SMT=y | 35 | CONFIG_SCHED_SMT=y |
35 | CONFIG_CMDLINE_BOOL=y | 36 | CONFIG_CMDLINE_BOOL=y |
36 | CONFIG_CMDLINE="" | 37 | CONFIG_CMDLINE="" |
37 | CONFIG_PM=y | 38 | CONFIG_PM_RUNTIME=y |
38 | CONFIG_PM_DEBUG=y | 39 | CONFIG_PM_DEBUG=y |
39 | # CONFIG_SECCOMP is not set | 40 | # CONFIG_SECCOMP is not set |
40 | # CONFIG_PCI is not set | 41 | # CONFIG_PCI is not set |
@@ -81,20 +82,23 @@ CONFIG_SCSI_MULTI_LUN=y | |||
81 | CONFIG_MD=y | 82 | CONFIG_MD=y |
82 | CONFIG_BLK_DEV_DM=m | 83 | CONFIG_BLK_DEV_DM=m |
83 | CONFIG_NETDEVICES=y | 84 | CONFIG_NETDEVICES=y |
84 | CONFIG_NET_ETHERNET=y | 85 | # CONFIG_NET_VENDOR_BROADCOM is not set |
86 | # CONFIG_NET_VENDOR_CHELSIO is not set | ||
87 | # CONFIG_NET_VENDOR_INTEL is not set | ||
88 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
89 | # CONFIG_NET_VENDOR_MICREL is not set | ||
90 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
91 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
92 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
85 | CONFIG_GELIC_NET=y | 93 | CONFIG_GELIC_NET=y |
86 | CONFIG_GELIC_WIRELESS=y | 94 | CONFIG_GELIC_WIRELESS=y |
87 | # CONFIG_NETDEV_10000 is not set | 95 | # CONFIG_NET_VENDOR_XILINX is not set |
88 | CONFIG_USB_USBNET=m | 96 | CONFIG_USB_USBNET=m |
89 | # CONFIG_USB_NET_CDCETHER is not set | 97 | # CONFIG_USB_NET_CDCETHER is not set |
98 | # CONFIG_USB_NET_CDC_NCM is not set | ||
90 | # CONFIG_USB_NET_NET1080 is not set | 99 | # CONFIG_USB_NET_NET1080 is not set |
91 | # CONFIG_USB_NET_CDC_SUBSET is not set | 100 | # CONFIG_USB_NET_CDC_SUBSET is not set |
92 | # CONFIG_USB_NET_ZAURUS is not set | 101 | # CONFIG_USB_NET_ZAURUS is not set |
93 | CONFIG_PPP=m | ||
94 | CONFIG_PPP_MULTILINK=y | ||
95 | CONFIG_PPP_ASYNC=m | ||
96 | CONFIG_PPP_DEFLATE=m | ||
97 | CONFIG_PPPOE=m | ||
98 | CONFIG_INPUT_FF_MEMLESS=m | 102 | CONFIG_INPUT_FF_MEMLESS=m |
99 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 103 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
100 | CONFIG_INPUT_JOYDEV=m | 104 | CONFIG_INPUT_JOYDEV=m |
@@ -135,22 +139,21 @@ CONFIG_USB=m | |||
135 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | 139 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y |
136 | CONFIG_USB_DEVICEFS=y | 140 | CONFIG_USB_DEVICEFS=y |
137 | # CONFIG_USB_DEVICE_CLASS is not set | 141 | # CONFIG_USB_DEVICE_CLASS is not set |
142 | CONFIG_USB_SUSPEND=y | ||
138 | CONFIG_USB_MON=m | 143 | CONFIG_USB_MON=m |
139 | CONFIG_USB_EHCI_HCD=m | 144 | CONFIG_USB_EHCI_HCD=m |
140 | CONFIG_USB_EHCI_TT_NEWSCHED=y | ||
141 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 145 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
142 | CONFIG_USB_OHCI_HCD=m | 146 | CONFIG_USB_OHCI_HCD=m |
143 | CONFIG_USB_STORAGE=m | 147 | CONFIG_USB_STORAGE=m |
144 | CONFIG_RTC_CLASS=y | 148 | CONFIG_RTC_CLASS=y |
145 | CONFIG_RTC_DRV_PS3=m | 149 | CONFIG_RTC_DRV_PS3=y |
150 | # CONFIG_IOMMU_SUPPORT is not set | ||
146 | CONFIG_EXT2_FS=m | 151 | CONFIG_EXT2_FS=m |
147 | CONFIG_EXT3_FS=m | 152 | CONFIG_EXT3_FS=m |
148 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 153 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
149 | CONFIG_EXT4_FS=y | 154 | CONFIG_EXT4_FS=y |
150 | CONFIG_INOTIFY=y | ||
151 | CONFIG_QUOTA=y | 155 | CONFIG_QUOTA=y |
152 | CONFIG_QFMT_V2=y | 156 | CONFIG_QFMT_V2=y |
153 | CONFIG_AUTOFS_FS=m | ||
154 | CONFIG_AUTOFS4_FS=m | 157 | CONFIG_AUTOFS4_FS=m |
155 | CONFIG_ISO9660_FS=m | 158 | CONFIG_ISO9660_FS=m |
156 | CONFIG_JOLIET=y | 159 | CONFIG_JOLIET=y |
@@ -167,19 +170,17 @@ CONFIG_CIFS=m | |||
167 | CONFIG_NLS=y | 170 | CONFIG_NLS=y |
168 | CONFIG_NLS_CODEPAGE_437=y | 171 | CONFIG_NLS_CODEPAGE_437=y |
169 | CONFIG_NLS_ISO8859_1=y | 172 | CONFIG_NLS_ISO8859_1=y |
173 | CONFIG_CRC_CCITT=m | ||
170 | CONFIG_CRC_T10DIF=y | 174 | CONFIG_CRC_T10DIF=y |
171 | CONFIG_MAGIC_SYSRQ=y | 175 | CONFIG_MAGIC_SYSRQ=y |
172 | CONFIG_DEBUG_FS=y | 176 | CONFIG_DEBUG_FS=y |
173 | CONFIG_DEBUG_KERNEL=y | ||
174 | CONFIG_DETECT_HUNG_TASK=y | 177 | CONFIG_DETECT_HUNG_TASK=y |
175 | CONFIG_PROVE_LOCKING=y | 178 | CONFIG_PROVE_LOCKING=y |
176 | CONFIG_DEBUG_LOCKDEP=y | 179 | CONFIG_DEBUG_LOCKDEP=y |
177 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
178 | CONFIG_DEBUG_INFO=y | 180 | CONFIG_DEBUG_INFO=y |
179 | CONFIG_DEBUG_WRITECOUNT=y | 181 | CONFIG_DEBUG_WRITECOUNT=y |
180 | CONFIG_DEBUG_MEMORY_INIT=y | 182 | CONFIG_DEBUG_MEMORY_INIT=y |
181 | CONFIG_DEBUG_LIST=y | 183 | CONFIG_DEBUG_LIST=y |
182 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
183 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 184 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
184 | # CONFIG_FTRACE is not set | 185 | # CONFIG_FTRACE is not set |
185 | CONFIG_DEBUG_STACKOVERFLOW=y | 186 | CONFIG_DEBUG_STACKOVERFLOW=y |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index a72f2415a64..30e7d0d20e4 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -304,6 +304,11 @@ CONFIG_PROC_KCORE=y | |||
304 | CONFIG_TMPFS=y | 304 | CONFIG_TMPFS=y |
305 | CONFIG_HUGETLBFS=y | 305 | CONFIG_HUGETLBFS=y |
306 | CONFIG_CRAMFS=m | 306 | CONFIG_CRAMFS=m |
307 | CONFIG_SQUASHFS=m | ||
308 | CONFIG_SQUASHFS_XATTR=y | ||
309 | CONFIG_SQUASHFS_ZLIB=y | ||
310 | CONFIG_SQUASHFS_LZO=y | ||
311 | CONFIG_SQUASHFS_XZ=y | ||
307 | CONFIG_NFS_FS=y | 312 | CONFIG_NFS_FS=y |
308 | CONFIG_NFS_V3=y | 313 | CONFIG_NFS_V3=y |
309 | CONFIG_NFS_V3_ACL=y | 314 | CONFIG_NFS_V3_ACL=y |