powerpc: remove CHRP and PMAC support from defconfigs, fix Kconfigs
Subsystems (2)
PATCH 1/1 powerpc: remove CHRP and PMAC support from defconfigs, fix Kconfigs
The Kconfig files for PowerPC CHRP and PMAC support had "default=y" for some Kconfig options, and this caused support for CHRP and PMAC platforms to be enabled incorrectly for several platforms. Fix the Kconfigs and the affected defconfigs.
---
This patch is for 2.6.28. Ben, please review and make sure I'm not being to conservative or too aggressive. I don't know enough about CHRP and PMAC to be sure I'm doing this right.
arch/powerpc/configs/83xx/asp8347_defconfig | 2 -- arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 2 -- arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 2 -- arch/powerpc/configs/83xx/mpc832x_mds_defconfig | 2 -- arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 2 -- arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 2 -- arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 2 -- arch/powerpc/configs/83xx/mpc834x_mds_defconfig | 2 -- arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 2 -- arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | 2 -- arch/powerpc/configs/83xx/mpc837x_mds_defconfig | 2 -- arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | 2 -- arch/powerpc/configs/83xx/sbc834x_defconfig | 2 -- arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 2 -- arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 2 -- arch/powerpc/configs/86xx/sbc8641d_defconfig | 2 -- arch/powerpc/configs/ep8248e_defconfig | 2 -- arch/powerpc/configs/mpc8272_ads_defconfig | 2 -- arch/powerpc/configs/mpc83xx_defconfig | 2 -- arch/powerpc/configs/pq2fads_defconfig | 2 -- arch/powerpc/platforms/chrp/Kconfig | 1 - arch/powerpc/platforms/powermac/Kconfig | 4 ---- 22 files changed, 0 insertions(+), 45 deletions(-)
arch/powerpc/configs/83xx/asp8347_defconfig +0 -2
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc832x_mds_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc834x_itx_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc834x_mds_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc836x_mds_defconfig +0 -2
@@ -163,11 +163,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +0 -2
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc837x_mds_defconfig +0 -2
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +0 -2
@@ -164,11 +164,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/83xx/sbc834x_defconfig +0 -2
@@ -162,11 +162,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig +0 -2
@@ -165,11 +165,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig +0 -2
@@ -167,11 +167,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/86xx/sbc8641d_defconfig +0 -2
@@ -166,11 +166,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/ep8248e_defconfig +0 -2
@@ -150,11 +150,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set CONFIG_PPC_82xx=y
arch/powerpc/configs/mpc8272_ads_defconfig +0 -2
@@ -151,11 +151,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set CONFIG_PPC_82xx=y
arch/powerpc/configs/mpc83xx_defconfig +0 -2
@@ -166,11 +166,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_82xx is not set
arch/powerpc/configs/pq2fads_defconfig +0 -2
@@ -152,11 +152,9 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PPC_MULTIPLATFORM=y CONFIG_CLASSIC32=y -CONFIG_PPC_CHRP=y # CONFIG_MPC5121_ADS is not set # CONFIG_MPC5121_GENERIC is not set # CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PMAC=y # CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL_NATIVE is not set CONFIG_PPC_82xx=y
arch/powerpc/platforms/chrp/Kconfig +0 -1
@@ -9,4 +9,3 @@ config PPC_CHRP select PPC_UDBG_16550 select PPC_NATIVE select PCI - default y
arch/powerpc/platforms/powermac/Kconfig +0 -4
@@ -6,7 +6,6 @@ config PPC_PMAC select PPC_INDIRECT_PCI if PPC32 select PPC_MPC106 if PPC32 select PPC_NATIVE - default y config PPC_PMAC64 bool
@@ -16,6 +15,3 @@ config PPC_PMAC64 select MPIC_U3_HT_IRQS select GENERIC_TBSYNC select PPC_970_NAP - default y - -
Signature · 1 line
1.5.5
Quoted 11 lines · Timur Tabi
The
Kconfigfiles for PowerPC CHRP and PMAC support had "default=y" for someKconfigoptions, and this caused support for CHRP and PMAC platforms to be enabled incorrectly for several platforms. Fix the Kconfigs and the affected defconfigs.Signed-off-by Timur Tabi <[email protected]>---
This patch is for 2.6.28. Ben, please review and make sure I'm not being to conservative or too aggressive. I don't know enough about CHRP and PMAC to be sure I'm doing this right.
Ping.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
Quoted 4 lines · Timur Tabi
The
Kconfigfiles for PowerPC CHRP and PMAC support had "default=y" for someKconfigoptions, and this caused support for CHRP and PMAC platforms to be enabled incorrectly for several platforms. Fix the Kconfigs and the affected defconfigs.
Ben,
When you applied this patch, you removed the Kconfig changes. Without those, doing a "make xxx_defconfig" will just add "CONFIG_PPC_PMAC=y" and "CONFIG_PPC_CHRP=y" to the .config!
$ make 83xx/mpc834x_itxgp_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/basic/docproc HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/kxgettext.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/lex.zconf.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # $ grep CHRP .config CONFIG_PPC_CHRP=y
So please apply my *original* patch.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
Quoted 11 lines · Timur Tabi
Quoted 4 lines · Timur Tabi
The
Kconfigfiles for PowerPC CHRP and PMAC support had "default=y" for someKconfigoptions, and this caused support for CHRP and PMAC platforms to be enabled incorrectly for several platforms. Fix the Kconfigs and the affected defconfigs.Ben,
When you applied this patch, you removed the
Kconfigchanges. Without those, doing a "makexxx_defconfig" will just add "CONFIG_PPC_PMAC=y" and "CONFIG_PPC_CHRP=y" to the .config!
Hrm. Yes, I removed those changes because I want to think more about that aspect of things.
Quoted 16 lines
$ make 83xx/mpc834x_itxgp_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/basic/docproc HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/kxgettext.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/lex.zconf.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # $ grep CHRP .config CONFIG_PPC_CHRP=y
Quoted 1 line
So please apply my *original* patch.
yeah well, there's a consistency problem. If we remove default for these we should remove default for all.
The bug I think is in your original patch in fact to just remove those from .config rather than explicitely set them to "not set".
I'm not going to remove the applied patch to avoid rebasing, it's harmless to keep it in, please send another one that does the above.
Ben.
Quoted 2 lines · Benjamin Herrenschmidt
yeah well, there's a consistency problem. If we remove default for these we should remove default for all.
I only removed the default from the ones I knew were wrong.
Quoted 2 lines
The bug I think is in your original patch in fact to just remove those from .config rather than explicitely set them to "not set".
I did that because with the Kconfig changes, it's not necessary to set them to "not set", so it kept the patch smaller.
Quoted 2 lines
I'm not going to remove the applied patch to avoid rebasing, it's harmless to keep it in, please send another one that does the above.
Ok.
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale