From b81c15c24195a5561fded3a59fc1091b70269426 Mon Sep 17 00:00:00 2001
From: Mark Walker <ziggimon@raindogs.dk>
Date: Fri, 10 Jun 2016 12:47:57 +0200
Subject: [PATCH] Make suggested changes for PR.

---
 .../files/3rdparty/bootloader/distroconfig.txt               | 0
 packages/tools/bcm2835-bootloader/package.mk                 | 3 +++
 packages/tools/bcm2835-bootloader/scripts/update.sh          | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt

diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index 4feaf62284..257ecb0cd5 100644
--- a/packages/tools/bcm2835-bootloader/package.mk
+++ b/packages/tools/bcm2835-bootloader/package.mk
@@ -51,7 +51,10 @@ makeinstall_target() {
 
     if [ -f $DISTRO_DIR/$DISTRO/config/distroconfig.txt ]; then
       cp -PRv $DISTRO_DIR/$DISTRO/config/distroconfig.txt $INSTALL/usr/share/bootloader
+    else
+      cp -PRv $PKG_DIR/files/3rdparty/bootloader/distroconfig.txt $INSTALL/usr/share/bootloader
     fi
+
     if [ -f $DISTRO_DIR/$DISTRO/config/config.txt ]; then
       cp -PRv $DISTRO_DIR/$DISTRO/config/config.txt $INSTALL/usr/share/bootloader
     else
diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh
index e75b45b688..7e77cc3a8d 100755
--- a/packages/tools/bcm2835-bootloader/scripts/update.sh
+++ b/packages/tools/bcm2835-bootloader/scripts/update.sh
@@ -54,7 +54,10 @@
 #    sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt
 #    sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt
   # Add distribution specific extra configuration file for the bootloader
-  elif [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then
+  fi
+
+# Add distro config file.
+  if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then
     cp $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT
   fi