summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSong Shuai <songshuaishuai@tinylab.org>2023-09-14 17:13:34 +0800
committerPalmer Dabbelt <palmer@rivosinc.com>2023-10-12 11:34:03 -0700
commit505b02957e74f0c5c4655647ccb04bdc945d18f6 (patch)
tree0f33219189cb2327dd52b24c1d60c81ffc3a6754 /arch
parent14a270bfab7ab1c4b605c01eeca5557447ad5a2b (diff)
downloadlinux-stable-505b02957e74f0c5c4655647ccb04bdc945d18f6.tar.gz
linux-stable-505b02957e74f0c5c4655647ccb04bdc945d18f6.tar.bz2
linux-stable-505b02957e74f0c5c4655647ccb04bdc945d18f6.zip
riscv: Remove duplicate objcopy flag
There are two duplicate `-O binary` flags when objcopying from vmlinux to Image/xipImage. RISC-V set `-O binary` flag in both OBJCOPYFLAGS in the top-level riscv Makefile and OBJCOPYFLAGS_* in the boot/Makefile, and the objcopy cmd in Kbuild would join them together. The `-O binary` flag is only needed for objcopying Image, so remove the OBJCOPYFLAGS in the top-level riscv Makefile. Fixes: c0fbcd991860 ("RISC-V: Build flat and compressed kernel images") Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> Link: https://lore.kernel.org/r/20230914091334.1458542-1-songshuaishuai@tinylab.org Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/riscv/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 1329e060c548..b43a6bb7e4dc 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -6,7 +6,6 @@
# for more details.
#
-OBJCOPYFLAGS := -O binary
LDFLAGS_vmlinux := -z norelro
ifeq ($(CONFIG_RELOCATABLE),y)
LDFLAGS_vmlinux += -shared -Bsymbolic -z notext --emit-relocs