diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-06-11 16:25:07 -0600 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-08-03 18:04:54 -0700 |
| commit | 1ef8cc928458d72cc312511def9165271f157dc9 (patch) | |
| tree | 3fec4800ae344ec8089c107c105b554df9c2bb6e /arch/arm/mach-tegra/Makefile.boot | |
| parent | ff2c85532acf099a99a063b869c341bc113fc0ec (diff) | |
ARM: dt: tegra: rename board files to match SoC
Most ARM ${board}.dts files are already named ${soc}-${board}.dts. This
change modifies the Tegra board files to be named the same way for
consistency.
Once a related change is made in U-Boot, this will cause both U-Boot and
the kernel to use the same names for the .dts files and SoC identifiers,
thus allowing U-Boot's recently added "soc" and "board" environment
variables to be used to construct the name of Tegra .dtb files, and hence
allow board-generic U-Boot bootcmd scripts to be written.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
(cherry picked from commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6)
Conflicts:
arch/arm/boot/dts/tegra20-paz00.dts
arch/arm/boot/dts/tegra20-trimslice.dts
arch/arm/mach-tegra/Makefile.boot
Change-Id: I4ec7605331c996d3aff84fc2fc37bcf06f0aba0b
Reviewed-on: http://git-master/r/110202
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-tegra/Makefile.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/Makefile.boot b/arch/arm/mach-tegra/Makefile.boot index 4d8452977a5e..7eee71774a8a 100644 --- a/arch/arm/mach-tegra/Makefile.boot +++ b/arch/arm/mach-tegra/Makefile.boot @@ -6,9 +6,9 @@ zreladdr-$(CONFIG_ARCH_TEGRA_3x_SOC) := 0x80008000 params_phys-$(CONFIG_ARCH_TEGRA_3x_SOC) := 0x80000100 initrd_phys-$(CONFIG_ARCH_TEGRA_3x_SOC) := 0x80800000 -dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb -dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb -dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb +dtb-$(CONFIG_MACH_HARMONY) += tegra20-harmony.dtb +dtb-$(CONFIG_MACH_SEABOARD) += tegra20-seaboard.dtb +dtb-$(CONFIG_MACH_VENTANA) += tegra20-ventana.dtb dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-whistler.dtb -dtb-$(CONFIG_MACH_CARDHU) += tegra-cardhu.dtb +dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-enterprise.dtb |