From 87f8696caf167f740e391da739098b2b9322e432 Mon Sep 17 00:00:00 2001 From: Michael Busby Date: Fri, 15 Apr 2016 13:44:13 +0100 Subject: [PATCH 1/3] copy the dt-blob to image this is a follow on from #155 --- scripts/image | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/image b/scripts/image index 598bcfa44f3..ba35f49f377 100755 --- a/scripts/image +++ b/scripts/image @@ -483,6 +483,7 @@ fi cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System/ cp -PR $BUILD/bcm2835-bootloader-*/fixup_x.dat $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System/fixup.dat cp -PR $BUILD/bcm2835-bootloader-*/start_x.elf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System/start.elf + [ -f $BUILD/bcm2835-bootloader-*/dt-blob.bin ] && cp -PR $BUILD/bcm2835-bootloader-*/dt-blob.bin $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System/dt-blob.bin # copy system files cp $TARGET_IMG/$IMAGE_NAME.system $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System/SYSTEM From da0bcc0cfbf5b9b979cee095a6913de9d07f735c Mon Sep 17 00:00:00 2001 From: Michael Busby Date: Fri, 15 Apr 2016 13:50:32 +0100 Subject: [PATCH 2/3] also dt-blob gets copied here --- scripts/mkimage | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/mkimage b/scripts/mkimage index 38579ea7dc1..f2544683f39 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -176,6 +176,10 @@ EOF mcopy $RELEASE_DIR/3rdparty/bootloader/fixup.dat :: mcopy $RELEASE_DIR/3rdparty/bootloader/start.elf :: mcopy $RELEASE_DIR/3rdparty/bootloader/config.txt :: + + if [ -d $RELEASE_DIR/3rdparty/bootloader/dt-blob.bin ]; then + mcopy $RELEASE_DIR/3rdparty/bootloader/dt-blob.bin :: + fi for dtb in $RELEASE_DIR/3rdparty/bootloader/*.dtb ; do if [ -f $dtb ] ; then From f981f3eb63056f79a94d1162a8b529d2feb9592d Mon Sep 17 00:00:00 2001 From: Michael Busby Date: Fri, 15 Apr 2016 16:40:51 +0100 Subject: [PATCH 3/3] corrected typo --- scripts/mkimage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mkimage b/scripts/mkimage index f2544683f39..3b692b50470 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -177,7 +177,7 @@ EOF mcopy $RELEASE_DIR/3rdparty/bootloader/start.elf :: mcopy $RELEASE_DIR/3rdparty/bootloader/config.txt :: - if [ -d $RELEASE_DIR/3rdparty/bootloader/dt-blob.bin ]; then + if [ -f $RELEASE_DIR/3rdparty/bootloader/dt-blob.bin ]; then mcopy $RELEASE_DIR/3rdparty/bootloader/dt-blob.bin :: fi