ARM: 9291/1: decompressor: simplify the path to the top vmlinux
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 14 Mar 2023 07:43:51 +0000 (08:43 +0100)
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tue, 11 Apr 2023 10:01:28 +0000 (11:01 +0100)
With commit 8debed3efe3a ("kbuild: export top-level LDFLAGS_vmlinux
only to scripts/Makefile.vmlinux") applied, we no longer see the error
message while building the ARM zImage, but we do not have a good reason
to complicate the file path either.

'$(obj)/../../../../vmlinux' is canonicalized to 'vmlinux'.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
arch/arm/boot/compressed/Makefile

index 2ef651a78fa2a979cdf3712c01f8481b69789093..726ecabcef0932dcc04f76d79ee806bb8f1d8ff1 100644 (file)
@@ -107,7 +107,7 @@ ccflags-remove-$(CONFIG_FUNCTION_TRACER) += -pg
 asflags-y := -DZIMAGE
 
 # Supply kernel BSS size to the decompressor via a linker symbol.
-KBSS_SZ = $(shell echo $$(($$($(NM) $(obj)/../../../../vmlinux | \
+KBSS_SZ = $(shell echo $$(($$($(NM) vmlinux | \
                sed -n -e 's/^\([^ ]*\) [ABD] __bss_start$$/-0x\1/p' \
                       -e 's/^\([^ ]*\) [ABD] __bss_stop$$/+0x\1/p') )) )
 LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)