diff options
| author | Kevin Hao <haokexin@gmail.com> | 2013-09-25 21:42:28 -0400 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-10-28 22:11:21 -0400 |
| commit | 9e0967572e5a0e8c887b2d71192bdad342e8a3dd (patch) | |
| tree | f2ea51fc2322337356c468cd3284e51b114cf6b6 /arch/powerpc/configs | |
| parent | befe7c123ee4546316bb9aa9952c0e2f7c0d9c48 (diff) | |
powerpc/85xx: use one kernel option for all the CoreNet_Generic boards
Currently all these boards use the same machine struct and also select
the same kernel options, so it seems a bit of redundant to keep one
separate kernel option for each board. Also update the defconfigs
according to this change.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/configs')
| -rw-r--r-- | arch/powerpc/configs/corenet32_smp_defconfig | 6 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet64_smp_defconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/configs/ppc64e_defconfig | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index 71bc43ab649a..bbd794deb6eb 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig | |||
| @@ -23,11 +23,7 @@ CONFIG_MODVERSIONS=y | |||
| 23 | # CONFIG_BLK_DEV_BSG is not set | 23 | # CONFIG_BLK_DEV_BSG is not set |
| 24 | CONFIG_PARTITION_ADVANCED=y | 24 | CONFIG_PARTITION_ADVANCED=y |
| 25 | CONFIG_MAC_PARTITION=y | 25 | CONFIG_MAC_PARTITION=y |
| 26 | CONFIG_P2041_RDB=y | 26 | CONFIG_CORENET_GENERIC=y |
| 27 | CONFIG_P3041_DS=y | ||
| 28 | CONFIG_P4080_DS=y | ||
| 29 | CONFIG_P5020_DS=y | ||
| 30 | CONFIG_P5040_DS=y | ||
| 31 | CONFIG_HIGHMEM=y | 27 | CONFIG_HIGHMEM=y |
| 32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 28 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 33 | CONFIG_BINFMT_MISC=m | 29 | CONFIG_BINFMT_MISC=m |
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index fa94fb3bb44d..63508ddee11c 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig | |||
| @@ -21,10 +21,7 @@ CONFIG_MODVERSIONS=y | |||
| 21 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | CONFIG_PARTITION_ADVANCED=y | 22 | CONFIG_PARTITION_ADVANCED=y |
| 23 | CONFIG_MAC_PARTITION=y | 23 | CONFIG_MAC_PARTITION=y |
| 24 | CONFIG_B4_QDS=y | 24 | CONFIG_CORENET_GENERIC=y |
| 25 | CONFIG_P5020_DS=y | ||
| 26 | CONFIG_P5040_DS=y | ||
| 27 | CONFIG_T4240_QDS=y | ||
| 28 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set | 25 | # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set |
| 29 | CONFIG_BINFMT_MISC=m | 26 | CONFIG_BINFMT_MISC=m |
| 30 | CONFIG_MATH_EMULATION=y | 27 | CONFIG_MATH_EMULATION=y |
diff --git a/arch/powerpc/configs/ppc64e_defconfig b/arch/powerpc/configs/ppc64e_defconfig index 0085dc4642c5..0a6be6dd6003 100644 --- a/arch/powerpc/configs/ppc64e_defconfig +++ b/arch/powerpc/configs/ppc64e_defconfig | |||
| @@ -23,7 +23,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y | |||
| 23 | CONFIG_PARTITION_ADVANCED=y | 23 | CONFIG_PARTITION_ADVANCED=y |
| 24 | CONFIG_MAC_PARTITION=y | 24 | CONFIG_MAC_PARTITION=y |
| 25 | CONFIG_EFI_PARTITION=y | 25 | CONFIG_EFI_PARTITION=y |
| 26 | CONFIG_P5020_DS=y | 26 | CONFIG_CORENET_GENERIC=y |
| 27 | CONFIG_CPU_FREQ=y | 27 | CONFIG_CPU_FREQ=y |
| 28 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y | 28 | CONFIG_CPU_FREQ_GOV_POWERSAVE=y |
| 29 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 29 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |