domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/arm-magic.sh: make the generated kernels also include $IMG_PREFIX

Browse Source 
In r45785 ixp4xx was changed to use a common image prefix also for
kernels, but the script creating them was not updated to generate the
expected filenames.
Fix this by letting arm-magic.sh respect $IMG_PREFIX for the output
kernel file names as well.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 45803
This commit is contained in:
Jonas Gorski
2015-05-28 10:48:23 +00:00
parent c1cc2217c2
commit ff6f66c192
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/arm-magic.sh
View File

@@ -28,15 +28,15 @@ do
hexid=$(printf %x\\n $2) hexid=$(printf %x\\n $2)
if [ "$2" -lt "256" ]; then if [ "$2" -lt "256" ]; then
# we have a low machtypeid, we just need a "mov" (e3a) # we have a low machtypeid, we just need a "mov" (e3a)
printf "\xe3\xa0\x10\x$hexid" > $BIN_DIR/openwrt-$1-zImage printf "\xe3\xa0\x10\x$hexid" > $BIN_DIR/$IMG_PREFIX-$1-zImage
else else
# we have a high machtypeid, we need a "mov" (e3a) and an "orr" (e38) # we have a high machtypeid, we need a "mov" (e3a) and an "orr" (e38)
if [ "$2" -lt "4096" ]; then if [ "$2" -lt "4096" ]; then
printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "2 3")\xe3\x81\x1c\x$(echo $hexid|cut -b 1)" > $BIN_DIR/openwrt-$1-zImage printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "2 3")\xe3\x81\x1c\x$(echo $hexid|cut -b 1)" > $BIN_DIR/$IMG_PREFIX-$1-zImage
else else
printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "3 4")\xe3\x81\x1c\x$(echo $hexid|cut -b "1 2")" > $BIN_DIR/openwrt-$1-zImage printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "3 4")\xe3\x81\x1c\x$(echo $hexid|cut -b "1 2")" > $BIN_DIR/$IMG_PREFIX-$1-zImage
fi fi
fi fi
# generate the image # generate the image
cat $BIN_DIR/$IMG_PREFIX-zImage >> $BIN_DIR/openwrt-$1-zImage cat $BIN_DIR/$IMG_PREFIX-zImage >> $BIN_DIR/$IMG_PREFIX-$1-zImage
done done