summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:01:34 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:01:34 +0100
commit856f60dbd157126241cf9033514137849bb5ca22 (patch)
treefca1784ef63b89a78127a0f4d1340f90eedd6848 /arch
parentec78bea331e195fff267ae949cee4777ef1add56 (diff)
parentf4ca20c4d27751ee749f382cfd4949d825534fce (diff)
downloadbarebox-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')
-rw-r--r--arch/arm/boards/nhk8815/setup.c3
-rw-r--r--arch/arm/pbl/Makefile2
-rw-r--r--arch/arm/tools/Makefile4
-rw-r--r--arch/nios2/Makefile2
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c
index 7f93ecb196..0c85b25c71 100644
--- a/arch/arm/boards/nhk8815/setup.c
+++ b/arch/arm/boards/nhk8815/setup.c
@@ -50,14 +50,17 @@ static struct nomadik_nand_platform_data nhk8815_nand_data = {
static struct resource nhk8815_nand_resources[] = {
{
+ .name = "nand_addr",
.start = NAND_IO_ADDR,
.end = NAND_IO_ADDR + 0xfff,
.flags = IORESOURCE_MEM,
}, {
+ .name = "nand_cmd",
.start = NAND_IO_CMD,
.end = NAND_IO_CMD + 0xfff,
.flags = IORESOURCE_MEM,
}, {
+ .name = "nand_data",
.start = NAND_IO_DATA,
.end = NAND_IO_DATA + 0xfff,
.flags = IORESOURCE_MEM,
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)
diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile
index 635cb1865e..67ae9e701b 100644
--- a/arch/arm/tools/Makefile
+++ b/arch/arm/tools/Makefile
@@ -5,6 +5,6 @@
#
include/generated/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
- @echo ' Generating $@'
- @mkdir -p $(dir $@)
+ $(Q)$(kecho) ' Generating $@'
+ $(Q)mkdir -p $(dir $@)
$(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
index b94e07465b..681944f22d 100644
--- a/arch/nios2/Makefile
+++ b/arch/nios2/Makefile
@@ -6,7 +6,7 @@ KALLSYMS += --symbol-prefix=_
archprepare: maketools
- @echo " SYMLINK include/nios_sopc.h -> arch/nios2/boards/$(board-y)/nios_sopc.h"
+ @$(kecho) " SYMLINK include/nios_sopc.h -> arch/nios2/boards/$(board-y)/nios_sopc.h"
@ln -fsn ../arch/nios2/boards/$(board-y)/nios_sopc.h include/nios_sopc.h
PHONY += maketools