Skip to content

Commit

Permalink
powerpc: disable CHRP and PMAC support in various defconfigs
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Timur Tabi authored and Kumar Gala committed Oct 13, 2008
1 parent 7e7385c commit dbe2163
Show file tree
Hide file tree
Showing 21 changed files with 44 additions and 1 deletion.
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/asp8347_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc832x_mds_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc834x_itx_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc834x_mds_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc836x_mds_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc837x_mds_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/83xx/sbc834x_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
5 changes: 4 additions & 1 deletion arch/powerpc/configs/86xx/gef_sbc610_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,10 @@ CONFIG_CLASSIC_RCU=y
#
# Platform support
#
# CONFIG_PPC_MULTIPLATFORM is not set
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_PPC_82xx is not set
# CONFIG_PPC_83xx is not set
CONFIG_PPC_86xx=y
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/86xx/sbc8641d_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/ep8248e_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/mpc8272_ads_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/mpc83xx_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/configs/pq2fads_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ CONFIG_CLASSIC_RCU=y
#
CONFIG_PPC_MULTIPLATFORM=y
CONFIG_CLASSIC32=y
# CONFIG_PPC_CHRP is not set
# CONFIG_PPC_PMAC is not set
# CONFIG_MPC5121_ADS is not set
# CONFIG_MPC5121_GENERIC is not set
# CONFIG_PPC_MPC52xx is not set
Expand Down

0 comments on commit dbe2163

Please sign in to comment.