Skip to contentSkip to conversation

cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected

PATCH In review Guenter Roeck 2 participants 2 messages Oct 30, 2016 – Nov 7, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected

If CONFIG_ETRAX_AXISFLASHMAP is not configured, the flash rescue image object file is empty. With recent versions of binutils, this results in the following build error.

cris-linux-objcopy: error:
the input file 'arch/cris/boot/rescue/rescue.o' has no sections

This is seen, for example, when trying to build cris:allnoconfig with recently generated toolchains.

Since it does not make sense to build a flash rescue image if there is no flash, only build it if CONFIG_ETRAX_AXISFLASHMAP is enabled.

Fixes 66ab3a74c5ce ("CRIS: Merge machine dependent boot/compressed ..")
---
 arch/cris/boot/rescue/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/cris/boot/rescue/Makefile +8 -0
index 52bd0bd1dd22..d98edbb30a18 100644
@@ -10,6 +10,9 @@
 
 asflags-y += $(LINUXINCLUDE)
 ccflags-y += -O2 $(LINUXINCLUDE)
+
+ifdef CONFIG_ETRAX_AXISFLASHMAP
+
 arch-$(CONFIG_ETRAX_ARCH_V10) = v10
 arch-$(CONFIG_ETRAX_ARCH_V32) = v32
 
@@ -28,6 +31,11 @@ $(obj)/rescue.bin: $(obj)/rescue.o FORCE
 	$(call if_changed,objcopy)
 	cp -p $(obj)/rescue.bin $(objtree)
 
+else
+$(obj)/rescue.bin:
+
+endif
+
 $(obj)/testrescue.bin: $(obj)/testrescue.o
 	$(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/testrescue.o tr.bin
 # Pad it to 784 bytes
Signature · 1 line
2.5.0
#1 lore raw
Quoted 4 lines · Guenter Roeck

If CONFIG_ETRAX_AXISFLASHMAP is not configured, the flash rescue image object file is empty. With recent versions of binutils, this results in the following build error.

Quoted 8 lines

cris-linux-objcopy: error:
the input file 'arch/cris/boot/rescue/rescue.o' has no sections

This is seen, for example, when trying to build cris:allnoconfig with recently generated toolchains.

Since it does not make sense to build a flash rescue image if there is no flash, only build it if CONFIG_ETRAX_AXISFLASHMAP is enabled.

Agreed, added to cris tree for 4.10.

Quoted 3 lines
Fixes 66ab3a74c5ce ("CRIS: Merge machine dependent boot/compressed ..")

Thanks!

/^JN - Jesper Nilsson

Signature · 1 line
               Jesper Nilsson -- [email protected]