aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/83xx
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2008-10-10 11:35:50 -0400
committerKumar Gala <galak@kernel.crashing.org>2008-10-13 12:09:59 -0400
commitdbe216319f4e4b23a37eeb623c8338fa59ac050e (patch)
treebc71faf445ff90dc7b6cacfa29f1a5d85496efc8 /arch/powerpc/configs/83xx
parent7e7385ce4115830bf5e0b43d62087a94871b78de (diff)
powerpc: disable CHRP and PMAC support in various defconfigs
Because CHRP and PMAC are by default enabled, several non-CHRP and non-PMAC PowerPC defconfigs will have these Kconfig options set erroneously. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs/83xx')
-rw-r--r--arch/powerpc/configs/83xx/asp8347_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc8313_rdb_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc8315_rdb_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_mds_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc832x_rdb_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itx_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc834x_mds_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_mds_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc836x_rdk_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_mds_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/mpc837x_rdb_defconfig2
-rw-r--r--arch/powerpc/configs/83xx/sbc834x_defconfig2
13 files changed, 26 insertions, 0 deletions
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 6638f5a03a77..0b1fa20f745c 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
164# 164#
165CONFIG_PPC_MULTIPLATFORM=y 165CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 166CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
167# CONFIG_MPC5121_ADS is not set 169# CONFIG_MPC5121_ADS is not set
168# CONFIG_MPC5121_GENERIC is not set 170# CONFIG_MPC5121_GENERIC is not set
169# CONFIG_PPC_MPC52xx is not set 171# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index df125f30fae8..b7eae2bdf19c 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index 6e0e08cf0b0d..b0a27a67d8c7 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index d6e204a7b26b..ad825bcddd1f 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 1f3d3434b29f..38267501f44d 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 4686c2151d05..90aab340e7ff 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index f11c25ecef76..7458a242d251 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index ffe4b2ef9691..1a92798938cf 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 71445e31a304..03d8cede0272 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
163# 163#
164CONFIG_PPC_MULTIPLATFORM=y 164CONFIG_PPC_MULTIPLATFORM=y
165CONFIG_CLASSIC32=y 165CONFIG_CLASSIC32=y
166# CONFIG_PPC_CHRP is not set
167# CONFIG_PPC_PMAC is not set
166# CONFIG_MPC5121_ADS is not set 168# CONFIG_MPC5121_ADS is not set
167# CONFIG_MPC5121_GENERIC is not set 169# CONFIG_MPC5121_GENERIC is not set
168# CONFIG_PPC_MPC52xx is not set 170# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index 58486ccae461..cdf84177370a 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
164# 164#
165CONFIG_PPC_MULTIPLATFORM=y 165CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 166CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
167# CONFIG_MPC5121_ADS is not set 169# CONFIG_MPC5121_ADS is not set
168# CONFIG_MPC5121_GENERIC is not set 170# CONFIG_MPC5121_GENERIC is not set
169# CONFIG_PPC_MPC52xx is not set 171# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index 0171e2176454..97e02d7a5b09 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
164# 164#
165CONFIG_PPC_MULTIPLATFORM=y 165CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 166CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
167# CONFIG_MPC5121_ADS is not set 169# CONFIG_MPC5121_ADS is not set
168# CONFIG_MPC5121_GENERIC is not set 170# CONFIG_MPC5121_GENERIC is not set
169# CONFIG_PPC_MPC52xx is not set 171# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index d6b383bb3644..5ac33054ce2c 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
164# 164#
165CONFIG_PPC_MULTIPLATFORM=y 165CONFIG_PPC_MULTIPLATFORM=y
166CONFIG_CLASSIC32=y 166CONFIG_CLASSIC32=y
167# CONFIG_PPC_CHRP is not set
168# CONFIG_PPC_PMAC is not set
167# CONFIG_MPC5121_ADS is not set 169# CONFIG_MPC5121_ADS is not set
168# CONFIG_MPC5121_GENERIC is not set 170# CONFIG_MPC5121_GENERIC is not set
169# CONFIG_PPC_MPC52xx is not set 171# CONFIG_PPC_MPC52xx is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index b8dd17bf040e..c359cc2a380e 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -162,6 +162,8 @@ CONFIG_CLASSIC_RCU=y
162# 162#
163CONFIG_PPC_MULTIPLATFORM=y 163CONFIG_PPC_MULTIPLATFORM=y
164CONFIG_CLASSIC32=y 164CONFIG_CLASSIC32=y
165# CONFIG_PPC_CHRP is not set
166# CONFIG_PPC_PMAC is not set
165# CONFIG_MPC5121_ADS is not set 167# CONFIG_MPC5121_ADS is not set
166# CONFIG_MPC5121_GENERIC is not set 168# CONFIG_MPC5121_GENERIC is not set
167# CONFIG_PPC_MPC52xx is not set 169# CONFIG_PPC_MPC52xx is not set
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-14 16:39:30 -0500