diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:34 +0100 |
commit | 856f60dbd157126241cf9033514137849bb5ca22 (patch) | |
tree | fca1784ef63b89a78127a0f4d1340f90eedd6848 /arch/arm/pbl | |
parent | ec78bea331e195fff267ae949cee4777ef1add56 (diff) | |
parent | f4ca20c4d27751ee749f382cfd4949d825534fce (diff) | |
download | barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.gz barebox-856f60dbd157126241cf9033514137849bb5ca22.tar.xz |
Merge branch 'for-next/misc'
Conflicts:
commands/Makefile
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/pbl')
-rw-r--r-- | arch/arm/pbl/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index fe68e72eed..286f8b5923 100644 --- a/arch/arm/pbl/Makefile +++ b/arch/arm/pbl/Makefile @@ -14,7 +14,7 @@ extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern $(obj)/zbarebox.bin: $(obj)/zbarebox FORCE $(call if_changed,objcopy) $(call cmd,check_file_size,$(CONFIG_BAREBOX_MAX_IMAGE_SIZE)) - @echo ' Barebox: $@ is ready' + $(Q)$(kecho) ' Barebox: $@ is ready' $(obj)/zbarebox.S: $(obj)/zbarebox FORCE $(call if_changed,disasm) |