riscv: further remove XIP
PATCH 1/1 riscv: further remove XIP
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 <[email protected]>
--- 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
arch/riscv/Makefile +2 -2
@@ -172,12 +172,12 @@ vdso-install-y += arch/riscv/kernel/vdso/vdso.so.dbg vdso-install-$(CONFIG_RISCV_USER_CFI) += arch/riscv/kernel/vdso_cfi/vdso-cfi.so.dbg vdso-install-$(CONFIG_COMPAT) += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg -BOOT_TARGETS := Image Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loader loader.bin xipImage vmlinuz.efi +BOOT_TARGETS := Image Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loader loader.bin vmlinuz.efi all: $(notdir $(KBUILD_IMAGE)) loader.bin: loader -Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loader xipImage vmlinuz.efi: Image +Image.gz Image.bz2 Image.lz4 Image.lzma Image.lzo Image.zst Image.xz loader vmlinuz.efi: Image $(BOOT_TARGETS): vmlinux $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
arch/riscv/boot/.gitignore +0 -1
@@ -5,4 +5,3 @@ loader loader.lds loader.bin vmlinuz* -xipImage
arch/riscv/boot/Makefile +1 -2
@@ -16,9 +16,8 @@ OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S OBJCOPYFLAGS_loader.bin :=-O binary -OBJCOPYFLAGS_xipImage :=-O binary -R .note -R .note.gnu.build-id -R .comment -S -targets := Image Image.* loader loader.o loader.lds loader.bin xipImage +targets := Image Image.* loader loader.o loader.lds loader.bin $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy)
arch/riscv/kernel/vmlinux-xip.lds.S deleted +0 -143
143 lines not on this page · raw message
Signature · 1 line
2.53.0
Quoted 5 lines · Jisheng Zhang
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 <[email protected]>
Reviewed-by Nam Cao <[email protected]>
Paul Walmsley
maintainerQuoted 5 lines · Jisheng Zhang
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 <[email protected]>
Thanks, queued for v7.3.
- Paul