From 5c60b12739f14936a7e99fb1c4f0ab7159c00b67 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 25 Jan 2015 13:51:37 +0100
Subject: [PATCH] bcm2835-bootloader: add support to install dtb files, thanks
 to Milhouse

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/tools/bcm2835-bootloader/files/create_sdcard | 2 +-
 packages/tools/bcm2835-bootloader/release             | 2 ++
 packages/tools/bcm2835-bootloader/scripts/update.sh   | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/tools/bcm2835-bootloader/files/create_sdcard b/packages/tools/bcm2835-bootloader/files/create_sdcard
index c714ad3a51..9a61758943 100755
--- a/packages/tools/bcm2835-bootloader/files/create_sdcard
+++ b/packages/tools/bcm2835-bootloader/files/create_sdcard
@@ -220,7 +220,7 @@ echo "#########################################################"
   echo "copying files to $MOUNTPOINT..."
   cp target/KERNEL $MOUNTPOINT/kernel.img
   cp target/SYSTEM $MOUNTPOINT
-  cp 3rdparty/bootloader/* $MOUNTPOINT
+  cp -r 3rdparty/bootloader/* $MOUNTPOINT
   cp openelec.ico $MOUNTPOINT
   cp README.md $MOUNTPOINT
 
diff --git a/packages/tools/bcm2835-bootloader/release b/packages/tools/bcm2835-bootloader/release
index defe80e686..39ec945f5f 100755
--- a/packages/tools/bcm2835-bootloader/release
+++ b/packages/tools/bcm2835-bootloader/release
@@ -25,3 +25,5 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader
   cp -PR $BUILD/bcm2835-bootloader-*/bootcode.bin $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
+  cp -PR $INSTALL/usr/share/bootloader/*.dtb $RELEASE_DIR/3rdparty/bootloader/
+  cp -PR $INSTALL/usr/share/bootloader/overlays $RELEASE_DIR/3rdparty/bootloader/
\ No newline at end of file
diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh
index 79c8f0d038..7054650000 100755
--- a/packages/tools/bcm2835-bootloader/scripts/update.sh
+++ b/packages/tools/bcm2835-bootloader/scripts/update.sh
@@ -30,6 +30,9 @@
   cp -p $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT
   cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT
 
+  cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT
+  cp -pR $SYSTEM_ROOT/usr/share/bootloader/overlays $BOOT_ROOT
+
 # cleanup not more needed files
   rm -rf $BOOT_ROOT/loader.bin
   rm -rf $BOOT_ROOT/fixup_x.dat