lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 020/370] cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected
    3.16.42-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Guenter Roeck <linux@roeck-us.net>

    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: 66ab3a74c5ce ("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: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/cris/boot/rescue/Makefile | 8 ++++++++
    1 file changed, 8 insertions(+)

    --- a/arch/cris/boot/rescue/Makefile
    +++ b/arch/cris/boot/rescue/Makefile
    @@ -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
    \
     
     \ /
      Last update: 2017-03-10 15:26    [W:4.050 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site