diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:34:21 +0200 |
| commit | 7b7631791ed9cad14ed0f54376049fab8807ea2c (patch) | |
| tree | 52341281ba5905b78dcb7f69158c4654b8bbffc4 /images | |
| parent | cdfca5dccb21258eccd549604a8481020d5f3e9f (diff) | |
| parent | 4c13cf95b2e37de75b26f2e8770d3b7328e32498 (diff) | |
| download | barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.gz barebox-7b7631791ed9cad14ed0f54376049fab8807ea2c.tar.xz | |
Merge branch 'for-next/tegra'
Conflicts:
arch/arm/dts/tegra20-colibri.dtsi
arch/arm/dts/tegra20-paz00.dts
arch/arm/dts/tegra20.dtsi
drivers/clk/tegra/clk-periph.c
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile.tegra | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/images/Makefile.tegra b/images/Makefile.tegra index f03503e838..c957599958 100644 --- a/images/Makefile.tegra +++ b/images/Makefile.tegra @@ -12,3 +12,8 @@ image-$(CONFIG_MACH_TOSHIBA_AC100) += barebox-tegra20-toshiba-ac100.img pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += start_toradex_colibri_t20_iris FILE_barebox-tegra20-toradex-colibri-t20-iris.img = start_toradex_colibri_t20_iris.pblx image-$(CONFIG_MACH_TORADEX_COLIBRI_T20) += barebox-tegra20-toradex-colibri-t20-iris.img + +# ----------------------- Tegra30 based boards --------------------------- +pblx-$(CONFIG_MACH_NVIDIA_BEAVER) += start_nvidia_beaver +FILE_barebox-tegra30-nvidia-beaver.img = start_nvidia_beaver.pblx +image-$(CONFIG_MACH_NVIDIA_BEAVER) += barebox-tegra30-nvidia-beaver.img |