summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-10-07 08:02:36 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-10-07 08:02:36 +0200
commit6e30646fa28908b3f199d070ebb85151fef52a10 (patch)
treead26005307ee7fe7674feeb68cb452091e7188c7 /images
parent904298deb07d532a76de153a42c6f678d2e4c740 (diff)
parentf93b5f8eb973a62affbaf134f07d367649ed3ae4 (diff)
downloadbarebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.gz
barebox-6e30646fa28908b3f199d070ebb85151fef52a10.tar.xz
Merge branch 'for-next/tegra'
Conflicts: arch/arm/dts/Makefile images/Makefile
Diffstat (limited to 'images')
-rw-r--r--images/Makefile1
-rw-r--r--images/Makefile.tegra14
2 files changed, 15 insertions, 0 deletions
diff --git a/images/Makefile b/images/Makefile
index e6732bf69f..ec033abeda 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -109,6 +109,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F))
include $(srctree)/images/Makefile.imx
include $(srctree)/images/Makefile.mvebu
include $(srctree)/images/Makefile.socfpga
+include $(srctree)/images/Makefile.tegra
targets += $(image-y) pbl.lds barebox.x barebox.z
targets += $(patsubst %,%.pblx,$(pblx-y))
diff --git a/images/Makefile.tegra b/images/Makefile.tegra
new file mode 100644
index 0000000000..1cf1432c96
--- /dev/null
+++ b/images/Makefile.tegra
@@ -0,0 +1,14 @@
+#
+# barebox image generation Makefile for Tegra images
+#
+
+board = $(srctree)/arch/$(ARCH)/boards
+
+# ----------------------- Tegra20 based boards ---------------------------
+pblx-$(CONFIG_MACH_TOSHIBA_AC100) += start_toshiba_ac100
+FILE_barebox-tegra20-toshiba-ac100.img = start_toshiba_ac100.pblx
+image-$(CONFIG_MACH_TOSHIBA_AC100) += barebox-tegra20-toshiba-ac100.img
+
+pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += 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_IRIS) += barebox-tegra20-toradex-colibri-t20-iris.img