Commit 4427259c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv-for-linus-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Paul Walmsley:

 - fix broken clang build on versions earlier than 19 and binutils
   versions earlier than 2.38.

   (This exposed that we're not properly testing earlier toolchain
   versions in our linux-next builds and PR submissions. This was fixed
   for this PR, and is being addressed more generally for -next builds.)

 - remove some redundant Makefile code

 - avoid building Canaan Kendryte K210-specific code on targets that
   don't build for the K210

* tag 'riscv-for-linus-6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  riscv: Fix CONFIG_AS_HAS_INSN for new .insn usage
  riscv: Remove redundant judgment for the default build target
  riscv: Build loader.bin exclusively for Canaan K210
parents 4ea7c171 dc20452e

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ config RISCV_NONSTANDARD_CACHE_OPS 
	  systems to handle cache management.



config AS_HAS_INSN

	def_bool $(as-instr,.insn r 51$(comma) 0$(comma) 0$(comma) t0$(comma) t0$(comma) zero)

	def_bool $(as-instr,.insn 0x100000f)



config AS_HAS_OPTION_ARCH

	# https://github.com/llvm/llvm-project/commit/9e8ed3403c191ab9c4903e8eeb8f732ff8a43cb4

arch/riscv/Makefile

+1 −16
Original line number Diff line number Diff line
@@ -134,21 +134,6 @@ endif 
CHECKFLAGS += -D__riscv -D__riscv_xlen=$(BITS)



# Default target when executing plain make

boot		:= arch/riscv/boot

ifeq ($(CONFIG_XIP_KERNEL),y)

KBUILD_IMAGE := $(boot)/xipImage

else

ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN_K210),yy)

KBUILD_IMAGE := $(boot)/loader.bin

else

ifeq ($(CONFIG_EFI_ZBOOT),)

KBUILD_IMAGE	:= $(boot)/Image.gz

else

KBUILD_IMAGE := $(boot)/vmlinuz.efi

endif

endif

endif



boot					:= arch/riscv/boot

boot-image-y				:= Image

boot-image-$(CONFIG_KERNEL_BZIP2)	:= Image.bz2
@@ -159,7 +144,7 @@ boot-image-$(CONFIG_KERNEL_LZO) := Image.lzo 
boot-image-$(CONFIG_KERNEL_ZSTD)	:= Image.zst

boot-image-$(CONFIG_KERNEL_XZ)		:= Image.xz

ifdef CONFIG_RISCV_M_MODE

boot-image-$(CONFIG_ARCH_CANAAN)	:= loader.bin

boot-image-$(CONFIG_SOC_CANAAN_K210)	:= loader.bin

endif

boot-image-$(CONFIG_EFI_ZBOOT)		:= vmlinuz.efi

boot-image-$(CONFIG_XIP_KERNEL)		:= xipImage