diff options
| author | Lucas Stach <dev@lynxeye.de> | 2019-11-09 15:28:23 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-11 09:15:55 +0100 |
| commit | 24fce509d00474d5978dc38828b39154431c8a49 (patch) | |
| tree | 74d0475c0d71d6c91d4b282a6ecfa20d54720622 /images | |
| parent | b2142963ef7391229dbe5021d72bbb209f53a8dd (diff) | |
| download | barebox-24fce509d00474d5978dc38828b39154431c8a49.tar.gz barebox-24fce509d00474d5978dc38828b39154431c8a49.tar.xz | |
ARM: zynq: move header generation to zynq_mkimage
Instead of generating a suitable image header with linker magic, move
all of this into zynq_mkimage. The configuration file format and parsing
is based on imx-image. This gets us one step further on the road to
proper multi-image support.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile.zynq | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/images/Makefile.zynq b/images/Makefile.zynq index cc0cf6d2df..b089a9fd26 100644 --- a/images/Makefile.zynq +++ b/images/Makefile.zynq @@ -1,14 +1,23 @@ # # barebox image generation Makefile for Xilinx Zynq images # + +zynqcfg_cpp_flags = -Wp,-MD,$(depfile) -nostdinc -x assembler-with-cpp \ + -I arch/arm/mach-zynq/include + +zynqcfg-tmp = $(subst $(comma),_,$(dot-target).zynqcfg.tmp) + quiet_cmd_zynq_image = ZYNQIMG $@ cmd_zynq_image = \ - $(objtree)/scripts/zynq_mkimage -f $(subst .zynqimg,,$@) -o $@ + $(CPP) $(zynqcfg_cpp_flags) -o $(zynqcfg-tmp) $(CFG_$(@F)) ; \ + $(objtree)/scripts/zynq_mkimage -c $(zynqcfg-tmp) \ + -f $(subst .zynqimg,,$@) -o $@ $(obj)/%.zynqimg: $(obj)/% FORCE $(call if_changed,zynq_image) #------------------------------------------------------------------------------ +CFG_start_pbl.pblb.zynqimg = $(board)/avnet-zedboard/zedboard.zynqcfg FILE_barebox-avnet-zedboard.img = start_pbl.pblb.zynqimg image-$(CONFIG_MACH_ZEDBOARD) += barebox-avnet-zedboard.img |