diff options
| author | Daniel Walker <dwalker@codeaurora.org> | 2010-10-12 11:52:14 -0700 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-10-27 14:24:01 -0700 |
| commit | efdfb2b118cc11c88adcbcb8036795eb34f419a8 (patch) | |
| tree | 45dd16e4ed0851d5d33bb640960776aefe54da7e /arch/arm/mach-msm/Kconfig | |
| parent | 79d98313e0985fa754fc50ea639cbafdfc0860a6 (diff) | |
| download | kernel_samsung_espresso10-efdfb2b118cc11c88adcbcb8036795eb34f419a8.zip kernel_samsung_espresso10-efdfb2b118cc11c88adcbcb8036795eb34f419a8.tar.gz kernel_samsung_espresso10-efdfb2b118cc11c88adcbcb8036795eb34f419a8.tar.bz2 | |
msm: fix Kconfig target board selection
This prevents build failures since it's currently possible to select
8x50, 7x30, or 7x00 without selecting a specific board. These changes
just force a target selection, which is currently defaulting to the most
common one (7x30 only has one).
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/Kconfig')
| -rw-r--r-- | arch/arm/mach-msm/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 3115a29..3d74a73 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -6,6 +6,7 @@ choice config ARCH_MSM7X00A bool "MSM7x00A / MSM7x01A" + select MACH_TROUT if !MACH_HALIBUT select ARCH_MSM_ARM11 select MSM_SMD select MSM_SMD_PKG3 @@ -15,6 +16,7 @@ config ARCH_MSM7X00A config ARCH_MSM7X30 bool "MSM7x30" + select MACH_MSM7X30_SURF # if ! select ARCH_MSM_SCORPION select MSM_SMD select MSM_VIC @@ -26,6 +28,7 @@ config ARCH_MSM7X30 config ARCH_QSD8X50 bool "QSD8X50" + select MACH_QSD8X50_SURF if !MACH_QSD8X50A_ST1_5 select ARCH_MSM_SCORPION select MSM_SMD select MSM_VIC @@ -37,12 +40,12 @@ config ARCH_QSD8X50 config ARCH_MSM8X60 bool "MSM8X60" + select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \ + && !MACH_MSM8X60_FFA) select ARM_GIC select CPU_V7 select MSM_V2_TLMM select MSM_GPIOMUX - select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \ - && !MACH_MSM8X60_FFA) endchoice |