aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/configs/corenet64_smp_defconfig35
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig31
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig31
3 files changed, 96 insertions, 1 deletions
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index 36a5c41449b1..1c6eb66c8c5b 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -26,6 +26,7 @@ CONFIG_P5040_DS=y
26CONFIG_T4240_QDS=y 26CONFIG_T4240_QDS=y
27# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set 27# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
28CONFIG_BINFMT_MISC=m 28CONFIG_BINFMT_MISC=m
29CONFIG_FSL_IFC=y
29CONFIG_PCIEPORTBUS=y 30CONFIG_PCIEPORTBUS=y
30CONFIG_PCI_MSI=y 31CONFIG_PCI_MSI=y
31CONFIG_RAPIDIO=y 32CONFIG_RAPIDIO=y
@@ -58,16 +59,33 @@ CONFIG_IP_SCTP=m
58CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 59CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
59CONFIG_DEVTMPFS=y 60CONFIG_DEVTMPFS=y
60CONFIG_MTD=y 61CONFIG_MTD=y
62CONFIG_MTD_PARTITIONS=y
63CONFIG_MTD_OF_PARTS=y
61CONFIG_MTD_CMDLINE_PARTS=y 64CONFIG_MTD_CMDLINE_PARTS=y
62CONFIG_MTD_CHAR=y 65CONFIG_MTD_CHAR=y
66CONFIG_MTD_BLKDEVS=y
63CONFIG_MTD_BLOCK=y 67CONFIG_MTD_BLOCK=y
68CONFIG_FTL=y
64CONFIG_MTD_CFI=y 69CONFIG_MTD_CFI=y
70CONFIG_MTD_GEN_PROBE=y
71CONFIG_MTD_MAP_BANK_WIDTH_1=y
72CONFIG_MTD_MAP_BANK_WIDTH_2=y
73CONFIG_MTD_MAP_BANK_WIDTH_4=y
74CONFIG_MTD_CFI_I1=y
75CONFIG_MTD_CFI_I2=y
76CONFIG_MTD_CFI_INTELEXT=y
65CONFIG_MTD_CFI_AMDSTD=y 77CONFIG_MTD_CFI_AMDSTD=y
66CONFIG_MTD_PHYSMAP_OF=y 78CONFIG_MTD_PHYSMAP_OF=y
67CONFIG_MTD_M25P80=y 79CONFIG_MTD_M25P80=y
80CONFIG_MTD_CFI_UTIL=y
81CONFIG_MTD_NAND_ECC=y
68CONFIG_MTD_NAND=y 82CONFIG_MTD_NAND=y
83CONFIG_MTD_NAND_IDS=y
69CONFIG_MTD_NAND_FSL_ELBC=y 84CONFIG_MTD_NAND_FSL_ELBC=y
70CONFIG_MTD_NAND_FSL_IFC=y 85CONFIG_MTD_NAND_FSL_IFC=y
86CONFIG_MTD_UBI=y
87CONFIG_MTD_UBI_WL_THRESHOLD=4096
88CONFIG_MTD_UBI_BEB_RESERVE=1
71CONFIG_PROC_DEVICETREE=y 89CONFIG_PROC_DEVICETREE=y
72CONFIG_BLK_DEV_LOOP=y 90CONFIG_BLK_DEV_LOOP=y
73CONFIG_BLK_DEV_RAM=y 91CONFIG_BLK_DEV_RAM=y
@@ -122,7 +140,16 @@ CONFIG_NTFS_FS=y
122CONFIG_PROC_KCORE=y 140CONFIG_PROC_KCORE=y
123CONFIG_TMPFS=y 141CONFIG_TMPFS=y
124CONFIG_HUGETLBFS=y 142CONFIG_HUGETLBFS=y
125# CONFIG_MISC_FILESYSTEMS is not set 143CONFIG_MISC_FILESYSTEMS=y
144CONFIG_JFFS2_FS=y
145CONFIG_JFFS2_FS_DEBUG=1
146CONFIG_JFFS2_FS_WRITEBUFFER=y
147CONFIG_JFFS2_ZLIB=y
148CONFIG_JFFS2_RTIME=y
149CONFIG_UBIFS_FS=y
150CONFIG_UBIFS_FS_XATTR=y
151CONFIG_UBIFS_FS_LZO=y
152CONFIG_UBIFS_FS_ZLIB=y
126CONFIG_NFS_FS=y 153CONFIG_NFS_FS=y
127CONFIG_NFS_V4=y 154CONFIG_NFS_V4=y
128CONFIG_ROOT_NFS=y 155CONFIG_ROOT_NFS=y
@@ -130,6 +157,12 @@ CONFIG_NFSD=m
130CONFIG_NLS_ISO8859_1=y 157CONFIG_NLS_ISO8859_1=y
131CONFIG_NLS_UTF8=m 158CONFIG_NLS_UTF8=m
132CONFIG_CRC_T10DIF=y 159CONFIG_CRC_T10DIF=y
160CONFIG_CRC16=y
161CONFIG_ZLIB_DEFLATE=y
162CONFIG_LZO_COMPRESS=y
163CONFIG_LZO_DECOMPRESS=y
164CONFIG_CRYPTO_DEFLATE=y
165CONFIG_CRYPTO_LZO=y
133CONFIG_FRAME_WARN=1024 166CONFIG_FRAME_WARN=1024
134CONFIG_MAGIC_SYSRQ=y 167CONFIG_MAGIC_SYSRQ=y
135CONFIG_DEBUG_FS=y 168CONFIG_DEBUG_FS=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index e12146fda278..37812b4b777b 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -47,6 +47,7 @@ CONFIG_HIGHMEM=y
47CONFIG_BINFMT_MISC=m 47CONFIG_BINFMT_MISC=m
48CONFIG_MATH_EMULATION=y 48CONFIG_MATH_EMULATION=y
49CONFIG_FORCE_MAX_ZONEORDER=12 49CONFIG_FORCE_MAX_ZONEORDER=12
50CONFIG_FSL_IFC=y
50CONFIG_PCI=y 51CONFIG_PCI=y
51CONFIG_PCI_MSI=y 52CONFIG_PCI_MSI=y
52CONFIG_RAPIDIO=y 53CONFIG_RAPIDIO=y
@@ -78,18 +79,33 @@ CONFIG_IP_SCTP=m
78CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 79CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
79CONFIG_DEVTMPFS=y 80CONFIG_DEVTMPFS=y
80CONFIG_MTD=y 81CONFIG_MTD=y
82CONFIG_MTD_PARTITIONS=y
83CONFIG_MTD_OF_PARTS=y
81CONFIG_MTD_CMDLINE_PARTS=y 84CONFIG_MTD_CMDLINE_PARTS=y
82CONFIG_MTD_CHAR=y 85CONFIG_MTD_CHAR=y
86CONFIG_MTD_BLKDEVS=y
83CONFIG_MTD_BLOCK=y 87CONFIG_MTD_BLOCK=y
84CONFIG_FTL=y 88CONFIG_FTL=y
85CONFIG_MTD_CFI=y 89CONFIG_MTD_CFI=y
90CONFIG_MTD_GEN_PROBE=y
91CONFIG_MTD_MAP_BANK_WIDTH_1=y
92CONFIG_MTD_MAP_BANK_WIDTH_2=y
93CONFIG_MTD_MAP_BANK_WIDTH_4=y
94CONFIG_MTD_CFI_I1=y
95CONFIG_MTD_CFI_I2=y
86CONFIG_MTD_CFI_INTELEXT=y 96CONFIG_MTD_CFI_INTELEXT=y
87CONFIG_MTD_CFI_AMDSTD=y 97CONFIG_MTD_CFI_AMDSTD=y
88CONFIG_MTD_PHYSMAP_OF=y 98CONFIG_MTD_PHYSMAP_OF=y
89CONFIG_MTD_M25P80=y 99CONFIG_MTD_M25P80=y
100CONFIG_MTD_CFI_UTIL=y
101CONFIG_MTD_NAND_ECC=y
90CONFIG_MTD_NAND=y 102CONFIG_MTD_NAND=y
103CONFIG_MTD_NAND_IDS=y
91CONFIG_MTD_NAND_FSL_ELBC=y 104CONFIG_MTD_NAND_FSL_ELBC=y
92CONFIG_MTD_NAND_FSL_IFC=y 105CONFIG_MTD_NAND_FSL_IFC=y
106CONFIG_MTD_UBI=y
107CONFIG_MTD_UBI_WL_THRESHOLD=4096
108CONFIG_MTD_UBI_BEB_RESERVE=1
93CONFIG_PROC_DEVICETREE=y 109CONFIG_PROC_DEVICETREE=y
94CONFIG_BLK_DEV_LOOP=y 110CONFIG_BLK_DEV_LOOP=y
95CONFIG_BLK_DEV_NBD=y 111CONFIG_BLK_DEV_NBD=y
@@ -207,6 +223,15 @@ CONFIG_NTFS_FS=y
207CONFIG_PROC_KCORE=y 223CONFIG_PROC_KCORE=y
208CONFIG_TMPFS=y 224CONFIG_TMPFS=y
209CONFIG_HUGETLBFS=y 225CONFIG_HUGETLBFS=y
226CONFIG_JFFS2_FS=y
227CONFIG_JFFS2_FS_DEBUG=1
228CONFIG_JFFS2_FS_WRITEBUFFER=y
229CONFIG_JFFS2_ZLIB=y
230CONFIG_JFFS2_RTIME=y
231CONFIG_UBIFS_FS=y
232CONFIG_UBIFS_FS_XATTR=y
233CONFIG_UBIFS_FS_LZO=y
234CONFIG_UBIFS_FS_ZLIB=y
210CONFIG_ADFS_FS=m 235CONFIG_ADFS_FS=m
211CONFIG_AFFS_FS=m 236CONFIG_AFFS_FS=m
212CONFIG_HFS_FS=m 237CONFIG_HFS_FS=m
@@ -225,6 +250,12 @@ CONFIG_NFS_V4=y
225CONFIG_ROOT_NFS=y 250CONFIG_ROOT_NFS=y
226CONFIG_NFSD=y 251CONFIG_NFSD=y
227CONFIG_CRC_T10DIF=y 252CONFIG_CRC_T10DIF=y
253CONFIG_CRC16=y
254CONFIG_ZLIB_DEFLATE=y
255CONFIG_LZO_COMPRESS=y
256CONFIG_LZO_DECOMPRESS=y
257CONFIG_CRYPTO_DEFLATE=y
258CONFIG_CRYPTO_LZO=y
228CONFIG_DEBUG_FS=y 259CONFIG_DEBUG_FS=y
229CONFIG_DETECT_HUNG_TASK=y 260CONFIG_DETECT_HUNG_TASK=y
230CONFIG_DEBUG_INFO=y 261CONFIG_DEBUG_INFO=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 8d00ea5b8a9f..7fc3e6ffe1cc 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -50,6 +50,7 @@ CONFIG_HIGHMEM=y
50CONFIG_BINFMT_MISC=m 50CONFIG_BINFMT_MISC=m
51CONFIG_MATH_EMULATION=y 51CONFIG_MATH_EMULATION=y
52CONFIG_FORCE_MAX_ZONEORDER=12 52CONFIG_FORCE_MAX_ZONEORDER=12
53CONFIG_FSL_IFC=y
53CONFIG_PCI=y 54CONFIG_PCI=y
54CONFIG_PCI_MSI=y 55CONFIG_PCI_MSI=y
55CONFIG_RAPIDIO=y 56CONFIG_RAPIDIO=y
@@ -81,18 +82,33 @@ CONFIG_IP_SCTP=m
81CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 82CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
82CONFIG_DEVTMPFS=y 83CONFIG_DEVTMPFS=y
83CONFIG_MTD=y 84CONFIG_MTD=y
85CONFIG_MTD_PARTITIONS=y
86CONFIG_MTD_OF_PARTS=y
84CONFIG_MTD_CMDLINE_PARTS=y 87CONFIG_MTD_CMDLINE_PARTS=y
85CONFIG_MTD_CHAR=y 88CONFIG_MTD_CHAR=y
89CONFIG_MTD_BLKDEVS=y
86CONFIG_MTD_BLOCK=y 90CONFIG_MTD_BLOCK=y
87CONFIG_FTL=y 91CONFIG_FTL=y
88CONFIG_MTD_CFI=y 92CONFIG_MTD_CFI=y
93CONFIG_MTD_GEN_PROBE=y
94CONFIG_MTD_MAP_BANK_WIDTH_1=y
95CONFIG_MTD_MAP_BANK_WIDTH_2=y
96CONFIG_MTD_MAP_BANK_WIDTH_4=y
97CONFIG_MTD_CFI_I1=y
98CONFIG_MTD_CFI_I2=y
89CONFIG_MTD_CFI_INTELEXT=y 99CONFIG_MTD_CFI_INTELEXT=y
90CONFIG_MTD_CFI_AMDSTD=y 100CONFIG_MTD_CFI_AMDSTD=y
91CONFIG_MTD_PHYSMAP_OF=y 101CONFIG_MTD_PHYSMAP_OF=y
92CONFIG_MTD_M25P80=y 102CONFIG_MTD_M25P80=y
103CONFIG_MTD_CFI_UTIL=y
104CONFIG_MTD_NAND_ECC=y
93CONFIG_MTD_NAND=y 105CONFIG_MTD_NAND=y
106CONFIG_MTD_NAND_IDS=y
94CONFIG_MTD_NAND_FSL_ELBC=y 107CONFIG_MTD_NAND_FSL_ELBC=y
95CONFIG_MTD_NAND_FSL_IFC=y 108CONFIG_MTD_NAND_FSL_IFC=y
109CONFIG_MTD_UBI=y
110CONFIG_MTD_UBI_WL_THRESHOLD=4096
111CONFIG_MTD_UBI_BEB_RESERVE=1
96CONFIG_PROC_DEVICETREE=y 112CONFIG_PROC_DEVICETREE=y
97CONFIG_BLK_DEV_LOOP=y 113CONFIG_BLK_DEV_LOOP=y
98CONFIG_BLK_DEV_NBD=y 114CONFIG_BLK_DEV_NBD=y
@@ -207,6 +223,15 @@ CONFIG_NTFS_FS=y
207CONFIG_PROC_KCORE=y 223CONFIG_PROC_KCORE=y
208CONFIG_TMPFS=y 224CONFIG_TMPFS=y
209CONFIG_HUGETLBFS=y 225CONFIG_HUGETLBFS=y
226CONFIG_JFFS2_FS=y
227CONFIG_JFFS2_FS_DEBUG=1
228CONFIG_JFFS2_FS_WRITEBUFFER=y
229CONFIG_JFFS2_ZLIB=y
230CONFIG_JFFS2_RTIME=y
231CONFIG_UBIFS_FS=y
232CONFIG_UBIFS_FS_XATTR=y
233CONFIG_UBIFS_FS_LZO=y
234CONFIG_UBIFS_FS_ZLIB=y
210CONFIG_ADFS_FS=m 235CONFIG_ADFS_FS=m
211CONFIG_AFFS_FS=m 236CONFIG_AFFS_FS=m
212CONFIG_HFS_FS=m 237CONFIG_HFS_FS=m
@@ -225,6 +250,12 @@ CONFIG_NFS_V4=y
225CONFIG_ROOT_NFS=y 250CONFIG_ROOT_NFS=y
226CONFIG_NFSD=y 251CONFIG_NFSD=y
227CONFIG_CRC_T10DIF=y 252CONFIG_CRC_T10DIF=y
253CONFIG_CRC16=y
254CONFIG_ZLIB_DEFLATE=y
255CONFIG_LZO_COMPRESS=y
256CONFIG_LZO_DECOMPRESS=y
257CONFIG_CRYPTO_DEFLATE=y
258CONFIG_CRYPTO_LZO=y
228CONFIG_DEBUG_FS=y 259CONFIG_DEBUG_FS=y
229CONFIG_DETECT_HUNG_TASK=y 260CONFIG_DETECT_HUNG_TASK=y
230CONFIG_DEBUG_INFO=y 261CONFIG_DEBUG_INFO=y