On Thu, Jul 29, 2021 at 7:22 AM Masahiro Yamada <masahi...@kernel.org> wrote: > > Commit c913e5f95e54 ("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: Masahiro Yamada <masahi...@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulni...@google.com> > --- > > arch/powerpc/boot/Makefile | 6 +----- > arch/powerpc/boot/install.sh | 13 ------------- > 2 files changed, 1 insertion(+), 18 deletions(-) > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index e312ea802aa6..a702f9d1ec0d 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -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.* \ > diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh > index b6a256bc96ee..658c93ca7437 100644 > --- a/arch/powerpc/boot/install.sh > +++ b/arch/powerpc/boot/install.sh > @@ -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; > -- > 2.27.0 > -- Thanks, ~Nick Desaulniers