summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-07-03 08:38:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-07-03 08:38:17 +0200
commit18ea2863bf76d6cd81c83706b5eb180dc5ad23bc (patch)
treeae51ca9e03b538a58c576e1fa79983ec31e22269 /images
parentc408a4ecbee60a9d512930972c09c6f9e365a671 (diff)
parent893f30f614da5ed132265f5c4da767ec26a8edf5 (diff)
downloadbarebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.gz
barebox-18ea2863bf76d6cd81c83706b5eb180dc5ad23bc.tar.xz
Merge branch 'for-next/omap'
Conflicts: arch/arm/boards/beagle/board.c
Diffstat (limited to 'images')
-rw-r--r--images/Makefile1
-rw-r--r--images/Makefile.omap319
2 files changed, 20 insertions, 0 deletions
diff --git a/images/Makefile b/images/Makefile
index 6ee1dccac0..a5f589b303 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -107,6 +107,7 @@ include $(srctree)/images/Makefile.imx
include $(srctree)/images/Makefile.imxhabv4
include $(srctree)/images/Makefile.mvebu
include $(srctree)/images/Makefile.mxs
+include $(srctree)/images/Makefile.omap3
include $(srctree)/images/Makefile.rockchip
include $(srctree)/images/Makefile.socfpga
include $(srctree)/images/Makefile.tegra
diff --git a/images/Makefile.omap3 b/images/Makefile.omap3
new file mode 100644
index 0000000000..694ec30836
--- /dev/null
+++ b/images/Makefile.omap3
@@ -0,0 +1,19 @@
+# %.mlo - convert into mlo image
+# ----------------------------------------------------------------
+quiet_cmd_omap3_mlo_image = MLO $@
+ cmd_omap3_mlo_image = scripts/omap_signGP -o $@ -l 0x40200000 -c $<
+
+$(obj)/%.omap3_mlo: $(obj)/% FORCE
+ $(call if_changed,omap3_mlo_image)
+
+pblx-$(CONFIG_MACH_BEAGLE) += start_omap3_beagleboard_sdram start_omap3_beagleboard_sram
+FILE_barebox-beagleboard.img = start_omap3_beagleboard_sdram.pblx
+omap3-barebox-$(CONFIG_MACH_BEAGLE) += barebox-beagleboard.img
+FILE_barebox-beagleboard-mlo.img = start_omap3_beagleboard_sram.pblx.omap3_mlo
+omap3-mlo-$(CONFIG_MACH_BEAGLE) += barebox-beagleboard-mlo.img
+
+ifdef CONFIG_OMAP_BUILD_IFT
+image-y += $(omap3-mlo-y)
+else
+image-y += $(omap3-barebox-y)
+endif