GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-22 06:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

Browse source
This commit is contained in:
Tom Rini 2016-05-24 08:20:43 -04:00
commit ec8fb48ce9
69 changed files with 1004 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/Makefile.spl
View file

@ -129,7 +129,12 @@ endif
boot.bin: $(obj)/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
else
ifdef CONFIG_ARCH_ZYNQ
MKIMAGEFLAGS_boot.bin = -T zynqimage
endif
ifdef CONFIG_ARCH_ZYNQMP
MKIMAGEFLAGS_boot.bin = -T zynqmpimage
endif
spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
@ -157,6 +162,8 @@ ifdef CONFIG_ARCH_ZYNQ
ALL-y += $(obj)/boot.bin
endif
ALL-(CONFIG_ARCH_ZYNQMP) += $(obj)/boot.bin
all: $(ALL-y)
quiet_cmd_cat = CAT $@