Merge tag 'sh-for-5.16' of git://git.libc.org/linux-sh
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2021 19:37:49 +0000 (11:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2021 19:37:49 +0000 (11:37 -0800)
Pull arch/sh updates from Rich Felker.

* tag 'sh-for-5.16' of git://git.libc.org/linux-sh:
  sh: pgtable-3level: Fix cast to pointer from integer of different size
  sh: fix READ/WRITE redefinition warnings
  sh: define __BIG_ENDIAN for math-emu
  sh: math-emu: drop unused functions
  sh: fix kconfig unmet dependency warning for FRAME_POINTER
  sh: Cleanup about SPARSE_IRQ
  sh: kdump: add some attribute to function
  maple: fix wrong return value of maple_bus_init().
  sh: boot: avoid unneeded rebuilds under arch/sh/boot/compressed/
  sh: boot: add intermediate vmlinux.bin* to targets instead of extra-y
  sh: boards: Fix the cacography in irq.c
  sh: check return code of request_irq
  sh: fix trivial misannotations

1  2 
arch/sh/boot/Makefile

diff --combined arch/sh/boot/Makefile
@@@ -27,8 -27,8 +27,8 @@@ suffix-$(CONFIG_KERNEL_XZ)    := x
  suffix-$(CONFIG_KERNEL_LZO)   := lzo
  
  targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz \
-          uImage.bz2 uImage.lzma uImage.xz uImage.lzo uImage.bin
extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \
+          uImage.bz2 uImage.lzma uImage.xz uImage.lzo uImage.bin \
         vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \
           vmlinux.bin.xz vmlinux.bin.lzo
  subdir- := compressed romimage
  
@@@ -80,30 -80,30 +80,30 @@@ $(obj)/vmlinux.bin.xz: $(obj)/vmlinux.b
  $(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE
        $(call if_changed,lzo)
  
 -$(obj)/uImage.bz2: $(obj)/vmlinux.bin.bz2
 +$(obj)/uImage.bz2: $(obj)/vmlinux.bin.bz2 FORCE
        $(call if_changed,uimage,bzip2)
  
 -$(obj)/uImage.gz: $(obj)/vmlinux.bin.gz
 +$(obj)/uImage.gz: $(obj)/vmlinux.bin.gz FORCE
        $(call if_changed,uimage,gzip)
  
 -$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma
 +$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma FORCE
        $(call if_changed,uimage,lzma)
  
 -$(obj)/uImage.xz: $(obj)/vmlinux.bin.xz
 +$(obj)/uImage.xz: $(obj)/vmlinux.bin.xz FORCE
        $(call if_changed,uimage,xz)
  
 -$(obj)/uImage.lzo: $(obj)/vmlinux.bin.lzo
 +$(obj)/uImage.lzo: $(obj)/vmlinux.bin.lzo FORCE
        $(call if_changed,uimage,lzo)
  
 -$(obj)/uImage.bin: $(obj)/vmlinux.bin
 +$(obj)/uImage.bin: $(obj)/vmlinux.bin FORCE
        $(call if_changed,uimage,none)
  
  OBJCOPYFLAGS_vmlinux.srec := -I binary -O srec
 -$(obj)/vmlinux.srec: $(obj)/compressed/vmlinux
 +$(obj)/vmlinux.srec: $(obj)/compressed/vmlinux FORCE
        $(call if_changed,objcopy)
  
  OBJCOPYFLAGS_uImage.srec := -I binary -O srec
 -$(obj)/uImage.srec: $(obj)/uImage
 +$(obj)/uImage.srec: $(obj)/uImage FORCE
        $(call if_changed,objcopy)
  
  $(obj)/uImage: $(obj)/uImage.$(suffix-y)