diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-05-28 10:48:23 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-28 10:48:23 +0000 |
| commit | ff6f66c1929416922c360d3d0901b1e593af849c (patch) | |
| tree | f0a8bc6b790003efda5755ffccb826b805f644cf /scripts | |
| parent | c1cc2217c24cbc419a642d896cf27d43038856a6 (diff) | |
| download | upstream-ff6f66c1929416922c360d3d0901b1e593af849c.tar.gz upstream-ff6f66c1929416922c360d3d0901b1e593af849c.tar.bz2 upstream-ff6f66c1929416922c360d3d0901b1e593af849c.zip | |
scripts/arm-magic.sh: make the generated kernels also include $IMG_PREFIX
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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/arm-magic.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/arm-magic.sh b/scripts/arm-magic.sh index eff9b4d414..29ec88ab2f 100755 --- a/scripts/arm-magic.sh +++ b/scripts/arm-magic.sh @@ -28,15 +28,15 @@ do hexid=$(printf %x\\n $2) if [ "$2" -lt "256" ]; then # 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 # we have a high machtypeid, we need a "mov" (e3a) and an "orr" (e38) 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 - 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 # 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 |