summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-07-21 15:56:04 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-08-16 08:45:37 +0200
commitdbd47524f4f3facaf8269ae001c6d3efd76fea4b (patch)
tree7d1536d40d61d53a734c6ff40a77bc90418af32c /images
parentf8761636f23a989ae877b446866ef289420b10f4 (diff)
downloadbarebox-dbd47524f4f3facaf8269ae001c6d3efd76fea4b.tar.gz
barebox-dbd47524f4f3facaf8269ae001c6d3efd76fea4b.tar.xz
ARM: mvebu: introduce multi image support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
-rw-r--r--images/.gitignore2
-rw-r--r--images/Makefile4
-rw-r--r--images/Makefile.mvebu26
3 files changed, 31 insertions, 1 deletions
diff --git a/images/.gitignore b/images/.gitignore
index b15d5604cf..9cc1728a70 100644
--- a/images/.gitignore
+++ b/images/.gitignore
@@ -5,6 +5,8 @@
*.imximg
*.map
*.src
+*.kwbimg
+*.kwbuartimg
pbl.lds
barebox.x
barebox.z
diff --git a/images/Makefile b/images/Makefile
index 65c533ac09..f17e699da0 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -108,6 +108,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F))
$(call if_changed,shipped)
include $(srctree)/images/Makefile.imx
+include $(srctree)/images/Makefile.mvebu
targets += $(image-y) pbl.lds barebox.x barebox.z
targets += $(patsubst %,%.pblx,$(pblx-y))
@@ -121,5 +122,6 @@ SECONDARY: $(addprefix $(obj)/,$(targets))
images: $(addprefix $(obj)/, $(image-y)) FORCE
@echo "images built:\n" $(patsubst %,%\\n,$(image-y))
-clean-files := *.pbl *.pblb *.pblx *.map start_*.imximg *.img barebox.z
+clean-files := *.pbl *.pblb *.pblx *.map start_*.imximg *.img barebox.z start_*.kwbimg \
+ start_*.kwbuartimg
clean-files += pbl.lds
diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu
new file mode 100644
index 0000000000..fe92cc2f58
--- /dev/null
+++ b/images/Makefile.mvebu
@@ -0,0 +1,26 @@
+#
+# barebox image generation Makefile for Marvell mvebu
+#
+
+# %.kwbimg - convert into kwb image
+# ----------------------------------------------------------------
+$(obj)/%.kwbimg: $(obj)/% FORCE
+ $(call if_changed,kwb_image)
+$(obj)/%.kwbuartimg: $(obj)/% FORCE
+ $(call if_changed,kwb_image)
+
+board = $(srctree)/arch/$(ARCH)/boards
+
+# ----------------------- Dove 88AP510 based boards ---------------------------
+SOLIDRUN_CUBOX_KWBOPTS = -c -i $(board)/solidrun-cubox/kwbimage.cfg -d 0x1000000 -e 0x1000000
+pblx-$(CONFIG_MACH_SOLIDRUN_CUBOX) += start_solidrun_cubox
+OPTS_start_solidrun_cubox.pblx.kwbimg = $(SOLIDRUN_CUBOX_KWBOPTS)
+FILE_barebox-solidrun-cubox.img = start_solidrun_cubox.pblx.kwbimg
+image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox.img
+
+OPTS_start_solidrun_cubox.pblx.kwbuartimg = -m uart $(SOLIDRUN_CUBOX_KWBOPTS)
+FILE_barebox-solidrun-cubox-uart.img = start_solidrun_cubox.pblx.kwbuartimg
+image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox-uart.img
+
+FILE_barebox-solidrun-cubox-2nd.img = start_solidrun_cubox.pblx
+image-$(CONFIG_MACH_SOLIDRUN_CUBOX) += barebox-solidrun-cubox-2nd.img