diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-09-05 10:38:46 +0200 |
| commit | ec102f635b41a7613a034c84e85559b46ed1c1f3 (patch) | |
| tree | c063a1883ca813345cafd39bc7e634a6c58e02c7 /images | |
| parent | e1827816d4863c5ced08f0af465472532c854af3 (diff) | |
| parent | 3a123d3e5739444a7fea1f46fb3254e817866f9d (diff) | |
| download | barebox-ec102f635b41a7613a034c84e85559b46ed1c1f3.tar.gz barebox-ec102f635b41a7613a034c84e85559b46ed1c1f3.tar.xz | |
Merge branch 'for-next/mvebu'
Diffstat (limited to 'images')
| -rw-r--r-- | images/.gitignore | 2 | ||||
| -rw-r--r-- | images/Makefile | 4 | ||||
| -rw-r--r-- | images/Makefile.mvebu | 26 |
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 79c3dc3d4c..0926615e01 100644 --- a/images/Makefile +++ b/images/Makefile @@ -107,6 +107,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)) @@ -120,5 +121,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 |