diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-05-21 16:44:26 -0400 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-06-20 14:37:40 -0400 |
| commit | 9132b0ed57320996b16eafbf651a04e02ad29092 (patch) | |
| tree | b9a245f56b78d83de9dfeb1b53a0ef4aec6be971 | |
| parent | 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6 (diff) | |
ARM: tegra: make .dts compilation depend on Tegra2 support
Update Makefile.boot to compile *.dts when the appropriate Tegra SoC
support is enabled, rather than requiring Kconfig to list each board
individually. Remove CONFIG_MACH_VENTANA now that it has no use.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/Makefile.boot | 10 |
2 files changed, 5 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 7c407393cd07..5b9b1166003f 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
| @@ -108,13 +108,6 @@ config MACH_WARIO | |||
| 108 | help | 108 | help |
| 109 | Support for the Wario version of Seaboard | 109 | Support for the Wario version of Seaboard |
| 110 | 110 | ||
| 111 | config MACH_VENTANA | ||
| 112 | bool "Ventana board" | ||
| 113 | depends on ARCH_TEGRA_2x_SOC | ||
| 114 | select MACH_TEGRA_DT | ||
| 115 | help | ||
| 116 | Support for the nVidia Ventana development platform | ||
| 117 | |||
| 118 | choice | 111 | choice |
| 119 | prompt "Default low-level debug console UART" | 112 | prompt "Default low-level debug console UART" |
| 120 | default TEGRA_DEBUG_UART_NONE | 113 | default TEGRA_DEBUG_UART_NONE |
diff --git a/arch/arm/mach-tegra/Makefile.boot b/arch/arm/mach-tegra/Makefile.boot index 8040345bd971..a369f96bd05e 100644 --- a/arch/arm/mach-tegra/Makefile.boot +++ b/arch/arm/mach-tegra/Makefile.boot | |||
| @@ -2,9 +2,9 @@ zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC) += 0x00008000 | |||
| 2 | params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100 | 2 | params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00000100 |
| 3 | initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000 | 3 | initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000 |
| 4 | 4 | ||
| 5 | dtb-$(CONFIG_MACH_HARMONY) += tegra20-harmony.dtb | 5 | dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-harmony.dtb |
| 6 | dtb-$(CONFIG_MACH_PAZ00) += tegra20-paz00.dtb | 6 | dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-paz00.dtb |
| 7 | dtb-$(CONFIG_MACH_SEABOARD) += tegra20-seaboard.dtb | 7 | dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-seaboard.dtb |
| 8 | dtb-$(CONFIG_MACH_TRIMSLICE) += tegra20-trimslice.dtb | 8 | dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-trimslice.dtb |
| 9 | dtb-$(CONFIG_MACH_VENTANA) += tegra20-ventana.dtb | 9 | dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-ventana.dtb |
| 10 | dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb | 10 | dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb |
