From 9e141e782fef1ff06460f8055f1a3ac771cde6a3 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Sun, 27 May 2018 13:22:31 +0200
Subject: [PATCH] Add overlay initial support (#23)

* Add overlay initial support

* Create load

* Cleanup NL

* Reorg dts files

* Update update-dtb.sh
---
 buildroot-external/barebox-env/bin/init             |   3 +++
 buildroot-external/barebox-env/overlay/load         |   5 +++++
 buildroot-external/board/ova/post-image.sh          |   2 +-
 .../barebox-state.dtb => fdt/barebox-state-efi.dtb} | Bin
 .../barebox-state.dts => fdt/barebox-state-efi.dts} |   1 -
 scripts/update-dtb.sh                               |   2 +-
 6 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 buildroot-external/barebox-env/overlay/load
 rename buildroot-external/{board/ova/barebox-state.dtb => fdt/barebox-state-efi.dtb} (100%)
 rename buildroot-external/{board/ova/barebox-state.dts => fdt/barebox-state-efi.dts} (99%)

diff --git a/buildroot-external/barebox-env/bin/init b/buildroot-external/barebox-env/bin/init
index 29678ded5..81c766df8 100644
--- a/buildroot-external/barebox-env/bin/init
+++ b/buildroot-external/barebox-env/bin/init
@@ -10,6 +10,9 @@ for i in /env/init/*; do
 	. $i
 done
 
+# Overlays
+. /env/overlay/load
+
 echo "- Hit m for menu or wait for autoboot -"
 timeout -a 1 -s -v key
 
diff --git a/buildroot-external/barebox-env/overlay/load b/buildroot-external/barebox-env/overlay/load
new file mode 100644
index 000000000..9a4bfe153
--- /dev/null
+++ b/buildroot-external/barebox-env/overlay/load
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for i in /env/overlay/*.dbto; do
+	oftree -o $i
+done
diff --git a/buildroot-external/board/ova/post-image.sh b/buildroot-external/board/ova/post-image.sh
index 448f3711e..f719f0e5b 100755
--- a/buildroot-external/board/ova/post-image.sh
+++ b/buildroot-external/board/ova/post-image.sh
@@ -18,7 +18,7 @@ mkdir -p ${BOOT_DATA}/EFI/BOOT
 mkdir -p ${BOOT_DATA}/EFI/barebox
 
 cp ${BINARIES_DIR}/barebox.bin ${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI
-cp ${BOARD_DIR}/barebox-state.dtb ${BOOT_DATA}/EFI/barebox/state.dtb
+cp ${BR2_EXTERNAL_HASSOS_PATH}/fdt/barebox-state-efi.dtb ${BOOT_DATA}/EFI/barebox/state.dtb
 
 # Create other layers
 create_boot_image ${BINARIES_DIR}
diff --git a/buildroot-external/board/ova/barebox-state.dtb b/buildroot-external/fdt/barebox-state-efi.dtb
similarity index 100%
rename from buildroot-external/board/ova/barebox-state.dtb
rename to buildroot-external/fdt/barebox-state-efi.dtb
diff --git a/buildroot-external/board/ova/barebox-state.dts b/buildroot-external/fdt/barebox-state-efi.dts
similarity index 99%
rename from buildroot-external/board/ova/barebox-state.dts
rename to buildroot-external/fdt/barebox-state-efi.dts
index 927ff6624..f337146bf 100644
--- a/buildroot-external/board/ova/barebox-state.dts
+++ b/buildroot-external/fdt/barebox-state-efi.dts
@@ -60,7 +60,6 @@
 
 		backend_state: state {
 			partuuid = "33236519-7f32-4dff-8002-3390b62c309d";
-
 		};
 	};
 
diff --git a/scripts/update-dtb.sh b/scripts/update-dtb.sh
index 1417d7026..2b1406320 100755
--- a/scripts/update-dtb.sh
+++ b/scripts/update-dtb.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-dtc -O dtb -o buildroot-external/board/ova/barebox-state.dtb buildroot-external/board/ova/barebox-state.dts
+dtc -O dtb -o buildroot-external/fdt/barebox-state-efi.dtb buildroot-external/fdt/barebox-state-efi.dts