Skip to content

Commit 4427259

Browse files
committed
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
2 parents 4ea7c17 + dc20452 commit 4427259

2 files changed

Lines changed: 2 additions & 17 deletions

File tree

arch/riscv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ config RISCV_NONSTANDARD_CACHE_OPS
367367
systems to handle cache management.
368368

369369
config AS_HAS_INSN
370-
def_bool $(as-instr,.insn r 51$(comma) 0$(comma) 0$(comma) t0$(comma) t0$(comma) zero)
370+
def_bool $(as-instr,.insn 0x100000f)
371371

372372
config AS_HAS_OPTION_ARCH
373373
# https://github.com/llvm/llvm-project/commit/9e8ed3403c191ab9c4903e8eeb8f732ff8a43cb4

arch/riscv/Makefile

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,21 +134,6 @@ endif
134134
CHECKFLAGS += -D__riscv -D__riscv_xlen=$(BITS)
135135

136136
# Default target when executing plain make
137-
boot := arch/riscv/boot
138-
ifeq ($(CONFIG_XIP_KERNEL),y)
139-
KBUILD_IMAGE := $(boot)/xipImage
140-
else
141-
ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN_K210),yy)
142-
KBUILD_IMAGE := $(boot)/loader.bin
143-
else
144-
ifeq ($(CONFIG_EFI_ZBOOT),)
145-
KBUILD_IMAGE := $(boot)/Image.gz
146-
else
147-
KBUILD_IMAGE := $(boot)/vmlinuz.efi
148-
endif
149-
endif
150-
endif
151-
152137
boot := arch/riscv/boot
153138
boot-image-y := Image
154139
boot-image-$(CONFIG_KERNEL_BZIP2) := Image.bz2
@@ -159,7 +144,7 @@ boot-image-$(CONFIG_KERNEL_LZO) := Image.lzo
159144
boot-image-$(CONFIG_KERNEL_ZSTD) := Image.zst
160145
boot-image-$(CONFIG_KERNEL_XZ) := Image.xz
161146
ifdef CONFIG_RISCV_M_MODE
162-
boot-image-$(CONFIG_ARCH_CANAAN) := loader.bin
147+
boot-image-$(CONFIG_SOC_CANAAN_K210) := loader.bin
163148
endif
164149
boot-image-$(CONFIG_EFI_ZBOOT) := vmlinuz.efi
165150
boot-image-$(CONFIG_XIP_KERNEL) := xipImage

0 commit comments

Comments
 (0)