From nobody Fri Oct 2 05:28:21 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85E3B2931F1 for ; Wed, 5 Aug 2026 01:20:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785892825; cv=none; b=VgRglU8U2JJ7eg+9R3ng8c2WlKsedveS402RtWucUrZiBm0emqd1BBNN6unZJio7e7o2ZW8YjtHUb8q7hF73xdt02eRgnme41MHLKIlpBniWWWyqswdHchBEAlKPcbZrrkxERhVVmgSQ3b6spid1eTpScTSas5CUMoLzen5SChM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785892825; c=relaxed/simple; bh=os/zntSLcKas1ESACPOKPHff9GqC8XoWhE0WJosqYsY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WMz9MHmi6xhH/laPnaayXoRz9VP6HROnvwRPsr8b8WiEhBMCun4NZ/9vFkG1vPSNODIMfiq8g7G0L+/UFQmlVfwxyM52PmIjwbBFoj6FHHMBGVJ7eV4AOqDsyCv3YrWK2TadpJ+o0X285PWp8V50G6AKKnK0VsY3tK6CpP5y29c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CrcrPlNe; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CrcrPlNe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 696B41F000E9; Wed, 5 Aug 2026 01:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785892824; bh=8DJoyM9NIvkIctJ7O6ewJL238CNBlDP8MIbfk2FrjSg=; h=From:To:Cc:Subject:Date; b=CrcrPlNegZ0zvAShRCcYfYa5o/bINcT9sNgj7au3bRLkcv0hPj7zzpNNlOqFkEvnk 2lMRyxtZgldJ7zQFCVYMsM7mspX5GwbXBfdG6eZWTxx9Tdr08sf73mXlvjbQaBL0V3 WJdzPWj30w5Nh6PDhiUtCdWwhFBpFhOoXWIFKaa2TPixleTm+nSQC1GL7ibd5p4+cM DDdUPC1GBJfm5eekWJyHKklDEjz0k5JOm8iflC5RMoTGpFIGNgYDGfHDU+uSk+pmlC QBm8om7rhcSPn4BY36RQyG21UWjMpCqbBF94iFjVhCb5KIMSf61y0Zih2ozDEFGnsF Io62GALdN1BvA== From: Jisheng Zhang To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] riscv: further remove XIP Date: Wed, 5 Aug 2026 09:00:49 +0800 Message-ID: <20260805010049.13918-1-jszhang@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After commit 9b3a2be84803 ("riscv: Remove support for XIP kernel"), something relatd with XIP are still there. Remove them to clean up the code. Signed-off-by: Jisheng Zhang Reviewed-by: Nam Cao --- arch/riscv/Makefile | 4 +- arch/riscv/boot/.gitignore | 1 - arch/riscv/boot/Makefile | 3 +- arch/riscv/kernel/vmlinux-xip.lds.S | 143 ---------------------------- 4 files changed, 3 insertions(+), 148 deletions(-) delete mode 100644 arch/riscv/kernel/vmlinux-xip.lds.S diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index ce0cc737f870..5ea0f7bccaef 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -172,12 +172,12 @@ vdso-install-y +=3D arch/riscv/kernel/vdso/vdso.so.= dbg vdso-install-$(CONFIG_RISCV_USER_CFI) +=3D arch/riscv/kernel/vdso_cfi/vdso= -cfi.so.dbg vdso-install-$(CONFIG_COMPAT) +=3D arch/riscv/kernel/compat_vdso/compat_vd= so.so.dbg =20 -BOOT_TARGETS :=3D Image Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo = Image.zst Image.xz loader loader.bin xipImage vmlinuz.efi +BOOT_TARGETS :=3D Image Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo = Image.zst Image.xz loader loader.bin vmlinuz.efi =20 all: $(notdir $(KBUILD_IMAGE)) =20 loader.bin: loader -Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loade= r xipImage vmlinuz.efi: Image +Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loade= r vmlinuz.efi: Image =20 $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=3D$(boot) $(boot)/$@ diff --git a/arch/riscv/boot/.gitignore b/arch/riscv/boot/.gitignore index e1bc507e8cb2..5d123ceaa012 100644 --- a/arch/riscv/boot/.gitignore +++ b/arch/riscv/boot/.gitignore @@ -5,4 +5,3 @@ loader loader.lds loader.bin vmlinuz* -xipImage diff --git a/arch/riscv/boot/Makefile b/arch/riscv/boot/Makefile index fcfbe3f814d6..4a2d75b7e42d 100644 --- a/arch/riscv/boot/Makefile +++ b/arch/riscv/boot/Makefile @@ -16,9 +16,8 @@ =20 OBJCOPYFLAGS_Image :=3D-O binary -R .note -R .note.gnu.build-id -R .commen= t -S OBJCOPYFLAGS_loader.bin :=3D-O binary -OBJCOPYFLAGS_xipImage :=3D-O binary -R .note -R .note.gnu.build-id -R .com= ment -S =20 -targets :=3D Image Image.* loader loader.o loader.lds loader.bin xipImage +targets :=3D Image Image.* loader loader.o loader.lds loader.bin =20 $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy) diff --git a/arch/riscv/kernel/vmlinux-xip.lds.S b/arch/riscv/kernel/vmlinu= x-xip.lds.S deleted file mode 100644 index a7611789bad5..000000000000 --- a/arch/riscv/kernel/vmlinux-xip.lds.S +++ /dev/null @@ -1,143 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2012 Regents of the University of California - * Copyright (C) 2017 SiFive - * Copyright (C) 2020 Vitaly Wool, Konsulko AB - */ - -#include -#define LOAD_OFFSET KERNEL_LINK_ADDR -/* No __ro_after_init data in the .rodata section - which will always be r= o */ -#define RO_AFTER_INIT_DATA - -#include -#include -#include -#include -#include - -OUTPUT_ARCH(riscv) -ENTRY(_start) - -jiffies =3D jiffies_64; - -SECTIONS -{ - /* Beginning of code and text segment */ - . =3D LOAD_OFFSET; - _xiprom =3D .; - _start =3D .; - HEAD_TEXT_SECTION - INIT_TEXT_SECTION(PAGE_SIZE) - /* we have to discard exit text and such at runtime, not link time */ - __exittext_begin =3D .; - .exit.text : - { - EXIT_TEXT - } - __exittext_end =3D .; - - .text : { - _text =3D .; - _stext =3D .; - TEXT_TEXT - SCHED_TEXT - LOCK_TEXT - KPROBES_TEXT - ENTRY_TEXT - IRQENTRY_TEXT - SOFTIRQENTRY_TEXT - _etext =3D .; - } - RO_DATA(L1_CACHE_BYTES) - .srodata : { - *(.srodata*) - } - .init.rodata : { - INIT_SETUP(16) - INIT_CALLS - CON_INITCALL - INIT_RAM_FS - } - _exiprom =3D .; /* End of XIP ROM area */ - - -/* - * From this point, stuff is considered writable and will be copied to RAM - */ - __data_loc =3D ALIGN(PAGE_SIZE); /* location in file */ - . =3D ALIGN(SECTION_ALIGN); /* location in memory */ - -#undef LOAD_OFFSET -#define LOAD_OFFSET (KERNEL_LINK_ADDR + _sdata - __data_loc) - - _sdata =3D .; /* Start of data section */ - _data =3D .; - RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) - _edata =3D .; - __start_ro_after_init =3D .; - .data.ro_after_init : AT(ADDR(.data.ro_after_init) - LOAD_OFFSET) { - *(.data..ro_after_init) - } - __end_ro_after_init =3D .; - - . =3D ALIGN(PAGE_SIZE); - __init_begin =3D .; - .init.data : { - INIT_DATA - } - .exit.data : { - EXIT_DATA - } - . =3D ALIGN(8); - __soc_early_init_table : { - __soc_early_init_table_start =3D .; - KEEP(*(__soc_early_init_table)) - __soc_early_init_table_end =3D .; - } - __soc_builtin_dtb_table : { - __soc_builtin_dtb_table_start =3D .; - KEEP(*(__soc_builtin_dtb_table)) - __soc_builtin_dtb_table_end =3D .; - } - - __init_end =3D .; - - . =3D ALIGN(16); - .xip.traps : { - __xip_traps_start =3D .; - *(.xip.traps) - __xip_traps_end =3D .; - } - - . =3D ALIGN(PAGE_SIZE); - .sdata : { - __global_pointer$ =3D . + 0x800; - *(.sdata*) - *(.sbss*) - } - - BSS_SECTION(PAGE_SIZE, PAGE_SIZE, 0) - - PERCPU_SECTION(L1_CACHE_BYTES) - - .rel.dyn : AT(ADDR(.rel.dyn) - LOAD_OFFSET) { - *(.rel.dyn*) - } - - /* - * End of copied data. We need a dummy section to get its LMA. - * Also located before final ALIGN() as trailing padding is not stored - * in the resulting binary file and useless to copy. - */ - .data.endmark : AT(ADDR(.data.endmark) - LOAD_OFFSET) { } - _edata_loc =3D LOADADDR(.data.endmark); - - . =3D ALIGN(PAGE_SIZE); - _end =3D .; - - STABS_DEBUG - DWARF_DEBUG - - DISCARDS -} --=20 2.53.0