From 311d20b12b01a04e96f156e17eefddec9260844c Mon Sep 17 00:00:00 2001
From: Mark Walker <ziggimon@raindogs.dk>
Date: Fri, 3 Jun 2016 11:40:42 +0200
Subject: [PATCH] Add distroconfig.txt to enable distribution specific
 config.txt overrides, without compromising custom edits in the config.txt
 file.

---
 .../files/3rdparty/bootloader/config.txt                   | 7 +++++++
 packages/tools/bcm2835-bootloader/package.mk               | 5 ++++-
 packages/tools/bcm2835-bootloader/scripts/update.sh        | 3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
index 7bf5c43869..83b586a610 100644
--- a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
+++ b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt
@@ -108,3 +108,10 @@
 # all values below this line were inserted from config.txt.bk (your old config)
 # and can be merged with the above values
 ################################################################################
+
+################################################################################
+# Include distribution specific config file if it exists.
+################################################################################
+
+[all]
+include distroconfig.txt
diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index 909e3cd25c..4feaf62284 100644
--- a/packages/tools/bcm2835-bootloader/package.mk
+++ b/packages/tools/bcm2835-bootloader/package.mk
@@ -48,7 +48,10 @@ makeinstall_target() {
     [ -f dt-blob.bin ] && cp -PRv dt-blob.bin $INSTALL/usr/share/bootloader/dt-blob.bin
 
     cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader
-    
+
+    if [ -f $DISTRO_DIR/$DISTRO/config/distroconfig.txt ]; then
+      cp -PRv $DISTRO_DIR/$DISTRO/config/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 4af59eea22..e75b45b688 100755
--- a/packages/tools/bcm2835-bootloader/scripts/update.sh
+++ b/packages/tools/bcm2835-bootloader/scripts/update.sh
@@ -53,6 +53,9 @@
 #    sed -e "s,gpu_mem=100,gpu_mem=128,g" -i $BOOT_ROOT/config.txt
 #    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
+    cp $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT
   fi
 
 # mount $BOOT_ROOT r/o