From d249255ad711226f609901de3e3eac42ac1bd560 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 10 Feb 2015 07:38:37 +0000 Subject: [PATCH] bcm2835-bootloader: update scripts to support multiple dtbs and avoid overwriting config.txt (closes #3893) Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/release | 18 ++++++++++-------- .../tools/bcm2835-bootloader/scripts/update.sh | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/tools/bcm2835-bootloader/release b/packages/tools/bcm2835-bootloader/release index 367ca17969..1fe744db6f 100755 --- a/packages/tools/bcm2835-bootloader/release +++ b/packages/tools/bcm2835-bootloader/release @@ -26,13 +26,15 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader cp -PR $BUILD/bcm2835-bootloader-*/fixup_x.dat $RELEASE_DIR/3rdparty/bootloader/fixup.dat cp -PR $BUILD/bcm2835-bootloader-*/start_x.elf $RELEASE_DIR/3rdparty/bootloader/start.elf - if [ -f $INSTALL/usr/share/bootloader/*.dtb ]; then - cp -PR $INSTALL/usr/share/bootloader/*.dtb $RELEASE_DIR/3rdparty/bootloader/ - fi - - for file in $INSTALL/usr/share/bootloader/overlays/* ; do - if [ -f $file ]; then - mkdir -p $RELEASE_DIR/3rdparty/bootloader/overlays - cp -PR $file $RELEASE_DIR/3rdparty/bootloader/overlays + for dtb in $INSTALL/usr/share/bootloader/*.dtb ; do + if [ -f $dtb ]; then + cp -PR $dtb $RELEASE_DIR/3rdparty/bootloader + fi + done + + for overlays in $INSTALL/usr/share/bootloader/overlays/* ; do + if [ -f $overlays ]; then + mkdir -p $RELEASE_DIR/3rdparty/bootloader/overlays + cp -PR $overlays $RELEASE_DIR/3rdparty/bootloader/overlays fi done diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index c033f076d0..9a55adeb96 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -30,7 +30,7 @@ cp -p $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT - for dtb in $SYSTEM_ROOT/usr/share/bootloader/* ; do + for dtb in $SYSTEM_ROOT/usr/share/bootloader/*.dtb ; do if [ -f $dtb ]; then cp -p $dtb $BOOT_ROOT fi