This is a note to let you know that I've just added the patch titled net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-wan-wanxl-use-m68kcc-instead-of-m68kas-for-rebuilding-firmware.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Fri 21 Aug 2020 04:30:09 PM CEST From: Masahiro Yamada <masahiroy@xxxxxxxxxx> Date: Thu, 26 Mar 2020 14:57:16 +0900 Subject: net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware From: Masahiro Yamada <masahiroy@xxxxxxxxxx> commit 734f3719d3438f9cc181d674c33ca9762e9148a1 upstream. The firmware source, wanxlfw.S, is currently compiled by the combo of $(CPP) and $(M68KAS). This is not what we usually do for compiling *.S files. In fact, this Makefile is the only user of $(AS) in the kernel build. Instead of combining $(CPP) and (AS) from different tool sets, using $(M68KCC) as an assembler driver is simpler, and saner. Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Signed-off-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/wan/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -40,16 +40,16 @@ $(obj)/wanxl.o: $(obj)/wanxlfw.inc ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y) ifeq ($(ARCH),m68k) - M68KAS = $(AS) + M68KCC = $(CC) M68KLD = $(LD) else - M68KAS = $(CROSS_COMPILE_M68K)as + M68KCC = $(CROSS_COMPILE_M68K)gcc M68KLD = $(CROSS_COMPILE_M68K)ld endif quiet_cmd_build_wanxlfw = BLD FW $@ cmd_build_wanxlfw = \ - $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(M68KAS) -m68360 -o $(obj)/wanxlfw.o; \ + $(M68KCC) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi -c -o $(obj)/wanxlfw.o $<; \ $(M68KLD) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \ rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o Patches currently in stable-queue which might be from masahiroy@xxxxxxxxxx are queue-5.4/kbuild-support-llvm-1-to-switch-the-default-tools-to-clang-llvm.patch queue-5.4/kbuild-remove-python2-variable.patch queue-5.4/net-wan-wanxl-use-m68kcc-instead-of-m68kas-for-rebuilding-firmware.patch queue-5.4/kbuild-remove-as-variable.patch queue-5.4/net-wan-wanxl-use-allow-to-pass-cross_compile_m68k-for-rebuilding-firmware.patch queue-5.4/kbuild-replace-as-clang-with-llvm_ias-1.patch queue-5.4/documentation-llvm-fix-the-name-of-llvm-size.patch queue-5.4/documentation-llvm-add-documentation-on-building-w-clang-llvm.patch queue-5.4/x86-boot-kbuild-allow-readelf-executable-to-be-specified.patch