Commit d42c6d0f authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/Makefile: Mark phony targets as PHONY 



Some of our phony targets are not marked as such. This can lead to
confusing errors, eg:

  $ make clean
  $ touch install
  $ make install
  make: 'install' is up to date.
  $

Fix it by adding them to the PHONY variable which is marked phony in
the top-level Makefile, or in scripts/Makefile.build for the boot
Makefile.

Suggested-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Reviewed-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200219000434.15872-1-mpe@ellerman.id.au
parent 6453f9ed

arch/powerpc/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ $(BOOT_TARGETS2): vmlinux 
	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)





PHONY += bootwrapper_install

bootwrapper_install:

	$(Q)$(MAKE) $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
@@ -403,9 +404,11 @@ define archhelp 
  @echo '  (minus the .dts extension).'

endef



PHONY += install

install:

	$(Q)$(MAKE) $(build)=$(boot) install



PHONY += vdso_install

vdso_install:

ifdef CONFIG_PPC64

	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
@@ -425,6 +428,7 @@ archheaders: 
ifdef CONFIG_STACKPROTECTOR

prepare: stack_protector_prepare



PHONY += stack_protector_prepare

stack_protector_prepare: prepare0

ifdef CONFIG_PPC64

	$(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "PACA_CANARY") print $$3;}' include/generated/asm-offsets.h))
@@ -436,10 +440,12 @@ endif 
ifdef CONFIG_SMP

prepare: task_cpu_prepare



PHONY += task_cpu_prepare

task_cpu_prepare: prepare0

	$(eval KBUILD_CFLAGS += -D_TASK_CPU=$(shell awk '{if ($$2 == "TASK_CPU") print $$3;}' include/generated/asm-offsets.h))

endif



PHONY += checkbin

# Check toolchain versions:

# - gcc-4.6 is the minimum kernel-wide version so nothing required.

checkbin:

arch/powerpc/boot/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -445,6 +445,8 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) 
zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))

	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^



PHONY += install zInstall



# anything not in $(targets)

clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \

	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \

CRA Git | Maintained and supported by SUSTech CRA and CCSE