diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:25:14 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:53:15 +0100 |
| commit | ab6423cae0323e8db2c8fdd0a99138d93fde2137 (patch) | |
| tree | a97493753a119e577161a4fb0b40b8edfc3923bb /board/cray/L1 | |
| parent | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (diff) | |
| parent | 2c072c958bb544c72f0e848375803dbd6971f022 (diff) | |
| download | u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.zip u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.gz u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.
Conflicts:
board/samsung/common/board.c
Diffstat (limited to 'board/cray/L1')
| -rw-r--r-- | board/cray/L1/Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/board/cray/L1/Makefile b/board/cray/L1/Makefile index 63f43da..655f530 100644 --- a/board/cray/L1/Makefile +++ b/board/cray/L1/Makefile @@ -9,10 +9,19 @@ obj-y = L1.o flash.o obj-y += init.o obj-y += bootscript.o -$(obj)/bootscript.c: $(obj)/bootscript.image - od -t x1 -v -A x $^ | awk -f $(srctree)/$(src)/x2c.awk > $@ +quiet_cmd_awk = AWK $@ + cmd_awk = od -t x1 -v -A x $< | $(AWK) -f $(filter-out $<,$^) > $@ +$(obj)/bootscript.c: $(obj)/bootscript.image $(src)/x2c.awk + $(call cmd,awk) + +quiet_cmd_mkimage = UIMAGE $@ +cmd_mkimage = $(objtree)/tools/mkimage $(MKIMAGEFLAGS_$(@F)) -d $< $@ \ + $(if $(KBUILD_VERBOSE:1=), >/dev/null) + +MKIMAGEFLAGS_bootscript.image := -A ppc -O linux -T script -C none \ + -a 0 -e 0 -n bootscript $(obj)/bootscript.image: $(src)/bootscript.hush - -$(OBJTREE)/tools/mkimage -A ppc -O linux -T script -C none -a 0 -e 0 -n bootscript -d $< $@ + $(call cmd,mkimage) clean-files := bootscript.c bootscript.image
\ No newline at end of file |