diff options
author | Timur Tabi <timur@freescale.com> | 2008-09-26 03:19:46 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-06 23:26:20 -0400 |
commit | 3396c72b92efd16bca16490a72277b3a494e0f0e (patch) | |
tree | 2031cba305381ce143ac1077c209a630e5c4ef75 /arch/powerpc/configs/83xx | |
parent | ebe40c5c4c888f2cbfd9f0880a8bc072e6fc3a0d (diff) |
powerpc: Remove CHRP and PMAC support from FSL defconfigs
Fix various defconfigs for Freescale chip based boards to remove
CONFIG_PPC_PMAC or CONFIG_PPC_CHRP which crept in due to those
being default y
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs/83xx')
-rw-r--r-- | arch/powerpc/configs/83xx/asp8347_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/configs/83xx/sbc834x_defconfig | 2 |
13 files changed, 0 insertions, 26 deletions
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig index 5e6780a088ce..6638f5a03a77 100644 --- a/arch/powerpc/configs/83xx/asp8347_defconfig +++ b/arch/powerpc/configs/83xx/asp8347_defconfig | |||
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y | |||
164 | # | 164 | # |
165 | CONFIG_PPC_MULTIPLATFORM=y | 165 | CONFIG_PPC_MULTIPLATFORM=y |
166 | CONFIG_CLASSIC32=y | 166 | CONFIG_CLASSIC32=y |
167 | CONFIG_PPC_CHRP=y | ||
168 | # CONFIG_MPC5121_ADS is not set | 167 | # CONFIG_MPC5121_ADS is not set |
169 | # CONFIG_MPC5121_GENERIC is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
170 | # CONFIG_PPC_MPC52xx is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
172 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
173 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | 172 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 2028337868b4..df125f30fae8 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index dd80eb0a87a1..6e0e08cf0b0d 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index bdf50c8a17e6..d6e204a7b26b 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index 4eef8c95480e..1f3d3434b29f 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index 8d6513931850..4686c2151d05 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index a8afa39d6f76..f11c25ecef76 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index 24c320a36670..ffe4b2ef9691 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index cf2706a5f34b..71445e31a304 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig | |||
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y | |||
163 | # | 163 | # |
164 | CONFIG_PPC_MULTIPLATFORM=y | 164 | CONFIG_PPC_MULTIPLATFORM=y |
165 | CONFIG_CLASSIC32=y | 165 | CONFIG_CLASSIC32=y |
166 | CONFIG_PPC_CHRP=y | ||
167 | # CONFIG_MPC5121_ADS is not set | 166 | # CONFIG_MPC5121_ADS is not set |
168 | # CONFIG_MPC5121_GENERIC is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
169 | # CONFIG_PPC_MPC52xx is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
171 | # CONFIG_PPC_CELL is not set | 169 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 170 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | 171 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig index 7d674be702fe..58486ccae461 100644 --- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | |||
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y | |||
164 | # | 164 | # |
165 | CONFIG_PPC_MULTIPLATFORM=y | 165 | CONFIG_PPC_MULTIPLATFORM=y |
166 | CONFIG_CLASSIC32=y | 166 | CONFIG_CLASSIC32=y |
167 | CONFIG_PPC_CHRP=y | ||
168 | # CONFIG_MPC5121_ADS is not set | 167 | # CONFIG_MPC5121_ADS is not set |
169 | # CONFIG_MPC5121_GENERIC is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
170 | # CONFIG_PPC_MPC52xx is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
172 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
173 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | 172 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index de472022aa81..0171e2176454 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig | |||
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y | |||
164 | # | 164 | # |
165 | CONFIG_PPC_MULTIPLATFORM=y | 165 | CONFIG_PPC_MULTIPLATFORM=y |
166 | CONFIG_CLASSIC32=y | 166 | CONFIG_CLASSIC32=y |
167 | CONFIG_PPC_CHRP=y | ||
168 | # CONFIG_MPC5121_ADS is not set | 167 | # CONFIG_MPC5121_ADS is not set |
169 | # CONFIG_MPC5121_GENERIC is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
170 | # CONFIG_PPC_MPC52xx is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
172 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
173 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | 172 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index e8d2d691d26c..d6b383bb3644 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | |||
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y | |||
164 | # | 164 | # |
165 | CONFIG_PPC_MULTIPLATFORM=y | 165 | CONFIG_PPC_MULTIPLATFORM=y |
166 | CONFIG_CLASSIC32=y | 166 | CONFIG_CLASSIC32=y |
167 | CONFIG_PPC_CHRP=y | ||
168 | # CONFIG_MPC5121_ADS is not set | 167 | # CONFIG_MPC5121_ADS is not set |
169 | # CONFIG_MPC5121_GENERIC is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
170 | # CONFIG_PPC_MPC52xx is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
172 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
173 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | 172 | # CONFIG_PPC_82xx is not set |
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 9245a67da200..b8dd17bf040e 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_defconfig | |||
@@ -162,11 +162,9 @@ CONFIG_CLASSIC_RCU=y | |||
162 | # | 162 | # |
163 | CONFIG_PPC_MULTIPLATFORM=y | 163 | CONFIG_PPC_MULTIPLATFORM=y |
164 | CONFIG_CLASSIC32=y | 164 | CONFIG_CLASSIC32=y |
165 | CONFIG_PPC_CHRP=y | ||
166 | # CONFIG_MPC5121_ADS is not set | 165 | # CONFIG_MPC5121_ADS is not set |
167 | # CONFIG_MPC5121_GENERIC is not set | 166 | # CONFIG_MPC5121_GENERIC is not set |
168 | # CONFIG_PPC_MPC52xx is not set | 167 | # CONFIG_PPC_MPC52xx is not set |
169 | CONFIG_PPC_PMAC=y | ||
170 | # CONFIG_PPC_CELL is not set | 168 | # CONFIG_PPC_CELL is not set |
171 | # CONFIG_PPC_CELL_NATIVE is not set | 169 | # CONFIG_PPC_CELL_NATIVE is not set |
172 | # CONFIG_PPC_82xx is not set | 170 | # CONFIG_PPC_82xx is not set |