Commit 156ca4e6 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michael Ellerman
Browse files

powerpc: remove unused zInstall target from arch/powerpc/boot/Makefile 



Commit c913e5f9 ("powerpc/boot: Don't install zImage.* from make
install") added the zInstall target to arch/powerpc/boot/Makefile,
but you cannot use it since the corresponding hook is missing in
arch/powerpc/Makefile.

It has never worked since its addition. Nobody has complained about
it for 7 years, which means this code was unneeded.

With this removal, the install.sh will be passed in with 4 parameters.
Simplify the shell script.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210729141937.445051-1-masahiroy@kernel.org
parent d04691d3

arch/powerpc/boot/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -448,11 +448,7 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) 
install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))

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



# Install the vmlinux and other built boot targets.

zInstall: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))

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



PHONY += install zInstall

PHONY += install



# anything not in $(targets)

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

arch/powerpc/boot/install.sh

+0 −13
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#   $2 - kernel image file

#   $3 - kernel map file

#   $4 - default install path (blank if root directory)

#   $5 and more - kernel boot files; zImage*, uImage, cuImage.*, etc.

#



# Bail with error code if anything goes wrong
@@ -41,15 +40,3 @@ fi 


cat $2 > $4/$image_name

cp $3 $4/System.map
 


# Copy all the bootable image files

path=$4

shift 4

while [ $# -ne 0 ]; do

	image_name=`basename $1`

	if [ -f $path/$image_name ]; then

		mv $path/$image_name $path/$image_name.old

	fi

	cat $1 > $path/$image_name

	shift

done;