diff options
| author | Timur Tabi <timur@freescale.com> | 2008-10-10 11:35:50 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-10-13 12:09:59 -0400 |
| commit | dbe216319f4e4b23a37eeb623c8338fa59ac050e (patch) | |
| tree | bc71faf445ff90dc7b6cacfa29f1a5d85496efc8 /arch/powerpc/configs/86xx | |
| parent | 7e7385ce4115830bf5e0b43d62087a94871b78de (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/86xx')
| -rw-r--r-- | arch/powerpc/configs/86xx/gef_sbc610_defconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/86xx/sbc8641d_defconfig | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig index f589489449da..312d7afbbe44 100644 --- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig | |||
| @@ -156,7 +156,10 @@ CONFIG_CLASSIC_RCU=y | |||
| 156 | # | 156 | # |
| 157 | # Platform support | 157 | # Platform support |
| 158 | # | 158 | # |
| 159 | # CONFIG_PPC_MULTIPLATFORM is not set | 159 | CONFIG_PPC_MULTIPLATFORM=y |
| 160 | CONFIG_CLASSIC32=y | ||
| 161 | # CONFIG_PPC_CHRP is not set | ||
| 162 | # CONFIG_PPC_PMAC is not set | ||
| 160 | # CONFIG_PPC_82xx is not set | 163 | # CONFIG_PPC_82xx is not set |
| 161 | # CONFIG_PPC_83xx is not set | 164 | # CONFIG_PPC_83xx is not set |
| 162 | CONFIG_PPC_86xx=y | 165 | CONFIG_PPC_86xx=y |
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig index 14116a80c7cd..c98c6ee44492 100644 --- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig | |||
| @@ -165,6 +165,8 @@ CONFIG_CLASSIC_RCU=y | |||
| 165 | # | 165 | # |
| 166 | CONFIG_PPC_MULTIPLATFORM=y | 166 | CONFIG_PPC_MULTIPLATFORM=y |
| 167 | CONFIG_CLASSIC32=y | 167 | CONFIG_CLASSIC32=y |
| 168 | # CONFIG_PPC_CHRP is not set | ||
| 169 | # CONFIG_PPC_PMAC is not set | ||
| 168 | # CONFIG_MPC5121_ADS is not set | 170 | # CONFIG_MPC5121_ADS is not set |
| 169 | # CONFIG_MPC5121_GENERIC is not set | 171 | # CONFIG_MPC5121_GENERIC is not set |
| 170 | # CONFIG_PPC_MPC52xx is not set | 172 | # CONFIG_PPC_MPC52xx is not set |
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig index 07e369d9e485..444ddf98436d 100644 --- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | |||
| @@ -167,6 +167,8 @@ CONFIG_CLASSIC_RCU=y | |||
| 167 | # | 167 | # |
| 168 | CONFIG_PPC_MULTIPLATFORM=y | 168 | CONFIG_PPC_MULTIPLATFORM=y |
| 169 | CONFIG_CLASSIC32=y | 169 | CONFIG_CLASSIC32=y |
| 170 | # CONFIG_PPC_CHRP is not set | ||
| 171 | # CONFIG_PPC_PMAC is not set | ||
| 170 | # CONFIG_MPC5121_ADS is not set | 172 | # CONFIG_MPC5121_ADS is not set |
| 171 | # CONFIG_MPC5121_GENERIC is not set | 173 | # CONFIG_MPC5121_GENERIC is not set |
| 172 | # CONFIG_PPC_MPC52xx is not set | 174 | # CONFIG_PPC_MPC52xx is not set |
diff --git a/arch/powerpc/configs/86xx/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig index 3326303d3765..d900f8f376cf 100644 --- a/arch/powerpc/configs/86xx/sbc8641d_defconfig +++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig | |||
| @@ -166,6 +166,8 @@ CONFIG_CLASSIC_RCU=y | |||
| 166 | # | 166 | # |
| 167 | CONFIG_PPC_MULTIPLATFORM=y | 167 | CONFIG_PPC_MULTIPLATFORM=y |
| 168 | CONFIG_CLASSIC32=y | 168 | CONFIG_CLASSIC32=y |
| 169 | # CONFIG_PPC_CHRP is not set | ||
| 170 | # CONFIG_PPC_PMAC is not set | ||
| 169 | # CONFIG_MPC5121_ADS is not set | 171 | # CONFIG_MPC5121_ADS is not set |
| 170 | # CONFIG_MPC5121_GENERIC is not set | 172 | # CONFIG_MPC5121_GENERIC is not set |
| 171 | # CONFIG_PPC_MPC52xx is not set | 173 | # CONFIG_PPC_MPC52xx is not set |