diff mbox series

[1/4] powerpc/Makefile: Don't use $(ARCH) unnecessarily

Message ID 20231206115548.1466874-1-mpe@ellerman.id.au (mailing list archive)
State Accepted
Commit dc420877b5bd92db5d80df6b117c7a0f987290af
Headers show
Series [1/4] powerpc/Makefile: Don't use $(ARCH) unnecessarily | expand

Commit Message

Michael Ellerman Dec. 6, 2023, 11:55 a.m. UTC 
There's no need to use $(ARCH) for references to the arch directory in
the source tree, it is always arch/powerpc.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Michael Ellerman Dec. 21, 2023, 10:38 a.m. UTC | #1 
On Wed, 06 Dec 2023 22:55:45 +1100, Michael Ellerman wrote:
> There's no need to use $(ARCH) for references to the arch directory in
> the source tree, it is always arch/powerpc.
> 
> 

Applied to powerpc/next.

[1/4] powerpc/Makefile: Don't use $(ARCH) unnecessarily
      https://git.kernel.org/powerpc/c/dc420877b5bd92db5d80df6b117c7a0f987290af
[2/4] powerpc/vdso: No need to undef powerpc for 64-bit build
      https://git.kernel.org/powerpc/c/42449052c94f22e18e01d71147d8fd75cb58132a
[3/4] powerpc/Makefile: Default to ppc64le_defconfig when cross building
      https://git.kernel.org/powerpc/c/22f17b02f88b48c01d3ac38d40d2b0b695ab2d10
[4/4] powerpc/Makefile: Auto detect cross compiler
      https://git.kernel.org/powerpc/c/402928b58ec62b42b11992a7b51ff2f56ed65a18

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index f19dbaa1d541..b0bc17c35ed7 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -161,7 +161,7 @@  CFLAGS-y += $(CONFIG_TUNE_CPU)
 
 asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1)
 
-KBUILD_CPPFLAGS	+= -I $(srctree)/arch/$(ARCH) $(asinstr)
+KBUILD_CPPFLAGS	+= -I $(srctree)/arch/powerpc $(asinstr)
 KBUILD_AFLAGS	+= $(AFLAGS-y)
 KBUILD_CFLAGS	+= $(call cc-option,-msoft-float)
 KBUILD_CFLAGS	+= $(CFLAGS-y)
@@ -232,7 +232,7 @@  BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.% uImage.%
 
 PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)
 
-boot := arch/$(ARCH)/boot
+boot := arch/powerpc/boot
 
 $(BOOT_TARGETS1): vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
@@ -336,7 +336,7 @@  PHONY += $(generated_configs)
 
 define archhelp
   echo '* zImage          - Build default images selected by kernel config'
-  echo '  zImage.*        - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
+  echo '  zImage.*        - Compressed kernel image (arch/powerpc/boot/zImage.*)'
   echo '  uImage          - U-Boot native image format'
   echo '  cuImage.<dt>    - Backwards compatible U-Boot image for older'
   echo '                    versions which do not support device trees'
@@ -347,12 +347,12 @@  define archhelp
   echo '                    (your) ~/bin/$(INSTALLKERNEL) or'
   echo '                    (distribution) /sbin/$(INSTALLKERNEL) or'
   echo '                    install to $$(INSTALL_PATH) and run lilo'
-  echo '  *_defconfig     - Select default config from arch/$(ARCH)/configs'
+  echo '  *_defconfig     - Select default config from arch/powerpc/configs'
   echo ''
   echo '  Targets with <dt> embed a device tree blob inside the image'
   echo '  These targets support board with firmware that does not'
   echo '  support passing a device tree directly.  Replace <dt> with the'
-  echo '  name of a dts file from the arch/$(ARCH)/boot/dts/ directory'
+  echo '  name of a dts file from the arch/powerpc/boot/dts/ directory'
   echo '  (minus the .dts extension).'
   echo
   $(foreach cfg,$(generated_configs),