Changeset 68a5f751 in rtems

Timestamp:

02/25/19 22:30:11 (5 years ago)

Author:

Pierre-Louis Garnier <garnie_a@…>

Branches:

5, master

Children:

e99847bf

Parents:

ecf62845

git-author:

Pierre-Louis Garnier <garnie_a@…> (02/25/19 22:30:11)

git-committer:

Sebastian Huber <sebastian.huber@…> (02/27/19 06:45:12)

Message:

arm/beagle: Fix sdcard.sh tool

File:

• bsps/arm/beagle/simscripts/sdcard.sh (modified) (5 diffs)

bsps/arm/beagle/simscripts/sdcard.sh

@@ -10 +10 @@
 rm -rf $TMPDIR
 mkdir -p $TMPDIR
+trap 'rm -rf $TMPDIR' EXIT
 
-if [ $# -ne 2 ]
-then    echo "Usage: $0 <RTEMS prefix> <RTEMS executable>"
+if [ $# -ne 3 ]
+then    echo "Usage: $0 <RTEMS prefix> <RTEMS executable> <Device Tree Blob>"
         exit 1
 fi
@@ -40 +41 @@
 esac
 
+dtb="$3"
+
 app=rtems-app.img
 
@@ -60 +63 @@
 # Prepare the executable.
 base=`basename $executable`
-$PREFIX/bin/arm-rtems4.12-objcopy $executable -O binary $TMPDIR/$base.bin
+$PREFIX/bin/arm-rtems5-objcopy $executable -O binary $TMPDIR/$base.bin
 gzip -9 $TMPDIR/$base.bin
 $PREFIX/bin/mkimage -A arm -O rtems -T kernel -a 0x80000000 -e 0x80000000 -n RTEMS -d $TMPDIR/$base.bin.gz $TMPDIR/$app
 echo "setenv bootdelay 5
 uenvcmd=run boot
-boot=fatload mmc 0 0x80800000 $app ; bootm 0x80800000" >$TMPDIR/$UENV
+boot=fatload mmc 0 0x80800000 $app ; fatload mmc 0 0x88000000 $(basename "$dtb") ; bootm 0x80800000 - 0x88000000" >$TMPDIR/$UENV
 
 # Copy the uboot and app image onto the FAT image
@@ -72 +75 @@
 $PREFIX/bin/mcopy -bsp -i $FATIMG $TMPDIR/$app ::$app
 $PREFIX/bin/mcopy -bsp -i $FATIMG $TMPDIR/$UENV ::$UENV
+# Copy DTB
+$PREFIX/bin/mcopy -bsp -i $FATIMG "$dtb" ::"$(basename "$dtb")"
 
 # Just a single FAT partition (type C) that uses all of the image
@@ -79 +84 @@
 dd if=$FATIMG of=$IMG seek=$OFFSET
 
-# cleanup
-rm -rf $TMPDIR
-
 echo "Result is in $IMG."