9453d46a12
commit 328cf6927bb72cadefddebbc9a23c793108147a2 upstream.
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.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: 66ab3a74c5 ("CRIS: Merge machine dependent boot/compressed ..")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
55 lines
1.6 KiB
Makefile
55 lines
1.6 KiB
Makefile
#
|
|
# Makefile for rescue (bootstrap) code
|
|
#
|
|
|
|
# CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE)
|
|
# ccflags-$(CONFIG_ETRAX_ARCH_V32) += -I$(srctree)/include/asm/arch/mach/ \
|
|
# -I$(srctree)/include/asm/arch
|
|
# asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch
|
|
# LD = gcc-cris -mlinux -march=v32 -nostdlib
|
|
|
|
asflags-y += $(LINUXINCLUDE)
|
|
ccflags-y += -O2 $(LINUXINCLUDE)
|
|
|
|
ifdef CONFIG_ETRAX_AXISFLASHMAP
|
|
|
|
arch-$(CONFIG_ETRAX_ARCH_V10) = v10
|
|
arch-$(CONFIG_ETRAX_ARCH_V32) = v32
|
|
|
|
ldflags-y += -T $(srctree)/$(src)/rescue_$(arch-y).lds
|
|
OBJCOPYFLAGS = -O binary --remove-section=.bss
|
|
obj-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
|
|
obj-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
|
|
OBJECTS := $(obj-y)
|
|
|
|
targets := rescue.o rescue.bin
|
|
|
|
$(obj)/rescue.o: $(OBJECTS) FORCE
|
|
$(call if_changed,ld)
|
|
|
|
$(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
|
|
dd if=/dev/zero of=tmp2423 bs=1 count=784
|
|
cat tr.bin tmp2423 >testrescue_tmp.bin
|
|
dd if=testrescue_tmp.bin of=$(obj)/testrescue.bin bs=1 count=784
|
|
rm tr.bin tmp2423 testrescue_tmp.bin
|
|
|
|
|
|
$(obj)/kimagerescue.bin: $(obj)/kimagerescue.o
|
|
$(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/kimagerescue.o ktr.bin
|
|
# Pad it to 784 bytes, that's what the rescue loader expects
|
|
dd if=/dev/zero of=tmp2423 bs=1 count=784
|
|
cat ktr.bin tmp2423 >kimagerescue_tmp.bin
|
|
dd if=kimagerescue_tmp.bin of=$(obj)/kimagerescue.bin bs=1 count=784
|
|
rm ktr.bin tmp2423 kimagerescue_tmp.bin
|
|
|