diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
| commit | 904298deb07d532a76de153a42c6f678d2e4c740 (patch) | |
| tree | 613d135d183962bf4dee1f5aef9449fbaceb0acd /images | |
| parent | ebf9022f2eee564fc4b0e4b37a8267319923d808 (diff) | |
| parent | fe4ecd1dbfc44d0fe420e8b28a984738d74f3b69 (diff) | |
| download | barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.gz barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.xz | |
Merge branch 'for-next/socfpga'
Conflicts:
scripts/Makefile
Diffstat (limited to 'images')
| -rw-r--r-- | images/.gitignore | 1 | ||||
| -rw-r--r-- | images/Makefile | 3 | ||||
| -rw-r--r-- | images/Makefile.socfpga | 34 |
3 files changed, 37 insertions, 1 deletions
diff --git a/images/.gitignore b/images/.gitignore index 9cc1728a70..1f601e730f 100644 --- a/images/.gitignore +++ b/images/.gitignore @@ -7,6 +7,7 @@ *.src *.kwbimg *.kwbuartimg +*.socfpgaimg pbl.lds barebox.x barebox.z diff --git a/images/Makefile b/images/Makefile index b87f522c15..e6732bf69f 100644 --- a/images/Makefile +++ b/images/Makefile @@ -108,6 +108,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F)) include $(srctree)/images/Makefile.imx include $(srctree)/images/Makefile.mvebu +include $(srctree)/images/Makefile.socfpga targets += $(image-y) pbl.lds barebox.x barebox.z targets += $(patsubst %,%.pblx,$(pblx-y)) @@ -123,5 +124,5 @@ images: $(addprefix $(obj)/, $(image-y)) FORCE @for i in $(image-y); do echo $$i; done clean-files := *.pbl *.pblb *.pblx *.map start_*.imximg *.img barebox.z start_*.kwbimg \ - start_*.kwbuartimg + start_*.kwbuartimg *.socfpgaimg clean-files += pbl.lds diff --git a/images/Makefile.socfpga b/images/Makefile.socfpga new file mode 100644 index 0000000000..5eed83c2d9 --- /dev/null +++ b/images/Makefile.socfpga @@ -0,0 +1,34 @@ +# +# barebox image generation Makefile for Altera socfpga +# + +# %.socfpga - convert into socfpga image +# ---------------------------------------------------------------- +quiet_cmd_socfpga_image = SOCFPGA-IMG $@ + cmd_socfpga_image = scripts/socfpga_mkimage -b -o $@ $< + +$(obj)/%.socfpgaimg: $(obj)/% FORCE + $(call if_changed,socfpga_image) + +# ----------------------- Cyclone5 based boards --------------------------- +pblx-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += start_socfpga_sockit_xload +FILE_barebox-socfpga-sockit-xload.img = start_socfpga_sockit_xload.pblx.socfpgaimg +xload-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += barebox-socfpga-sockit-xload.img + +pblx-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += start_socfpga_sockit +FILE_barebox-socfpga-sockit.img = start_socfpga_sockit.pblx +barebox-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += barebox-socfpga-sockit.img + +pblx-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += start_socfpga_socrates_xload +FILE_barebox-socfpga-socrates-xload.img = start_socfpga_socrates_xload.pblx.socfpgaimg +xload-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += barebox-socfpga-socrates-xload.img + +pblx-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += start_socfpga_socrates +FILE_barebox-socfpga-socrates.img = start_socfpga_socrates.pblx +barebox-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += barebox-socfpga-socrates.img + +ifdef CONFIG_ARCH_SOCFPGA_XLOAD +image-y += $(xload-y) +else +image-y += $(barebox-y) +endif |