Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29f1aff2 authored by Grant Likely's avatar Grant Likely Committed by Benjamin Herrenschmidt
Browse files

powerpc: Copy bootable images in the default install script 



This patch makes the default install script (arch/powerpc/boot/install.sh)
copy the bootable image files into the install directory.  Before this
patch only the vmlinux image file was copied.

This patch makes the default 'make install' command useful for embedded
development when $(INSTALL_PATH) is set in the environment.

As a side effect, this patch changes the calling convention of the
install.sh script.  Instead of a single 5th parameter, the script is now
passed a list of all the target images stored in the $(image-y) Makefile
variable.  This should be backwards compatible with existing install scripts
since it just adds additional arguments and does not change existing ones.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 893473df

arch/powerpc/boot/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -356,7 +356,7 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) 
	@rm -f $@; ln $< $@

	@rm -f $@; ln $< $@





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

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

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

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





# anything not in $(targets)

# anything not in $(targets)

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

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

arch/powerpc/boot/install.sh

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

#   $2 - kernel image file

#   $3 - kernel map file

#   $3 - kernel map file

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

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

#   $5 - kernel boot file, the zImage

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

#

#





# User may have a custom install script

# User may have a custom install script
@@ -38,3 +38,15 @@ fi 




cat $2 > $4/$image_name

cat $2 > $4/$image_name

cp $3 $4/System.map

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;