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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -897,7 +897,7 @@ endef # directory for generated filesas used by some architectures. define create-symlink if [ ! -L include/asm ]; then \ - echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ + $(kecho) ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ if [ ! -d include/asm-$(SRCARCH) ]; then \ mkdir -p include/asm-$(SRCARCH); \ fi; \ @@ -910,11 +910,11 @@ include/asm: $(Q)$(create-symlink) include/config.h: include/config/auto.conf - @echo ' SYMLINK $@ -> $(BOARD)/config.h' + $(Q)$(kecho) ' SYMLINK $@ -> $(BOARD)/config.h' ifneq ($(KBUILD_SRC),) $(Q)ln -fsn $(srctree)/$(BOARD)/config.h $@ else - @ln -fsn ../$(BOARD)/config.h $@ + $(Q)ln -fsn ../$(BOARD)/config.h $@ endif # Generate some files |