[DistroKit] [PATCH 05/10] barebox: deploy new barebox-raspberry-pi.img

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

The generic barebox-dt-2nd.img mimics Linux and allows booting barebox
with an external device tree as if it were a kernel. We employ this for
using the same image for Rpi 2 and 3 by placing barebox device trees
into the FAT boot partition and having the VideoCore pass the correct
device tree to barebox.

While this works, it means the VideoCore won't patch the kernel device
tree, but many users depend on the VideoCore to apply overlays for
kernel consumption. While this could be done in barebox instead, it
doesn't have the familiar config.txt interface and it doesn't cover some
of the more obscure magic the videocore does: e.g. when applying an
overlay configuring the USBOTG, the VideCore will reconfigure clocks as
a side effect of applying the overlay.

For this reason, barebox now also has a barebox-raspberry-pi.img that
behaves the same as barebox-dt-2nd.img with the difference that it has
the multiple device trees built-in. It's already being generated since
updating to the new release, so let's make use of this.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/config/images/rpi2.config | 7 +------
 configs/platform-v7a/rules/barebox-rpi2.make   | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi2.config
index 08329ff34dc8..08bb33b125a5 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi2.config
@@ -1,12 +1,7 @@
 image rpi2-boot.vfat {
 	vfat {
 		files = { @FIRMWARE_RPI2@ }
-		file barebox.img { image = barebox-dt-2nd-rpi.img }
- 		file bcm2836-rpi-2-b.dtb { image = barebox-bcm2836-rpi-2.dtb }
- 		file bcm2837-rpi-3-b.dtb { image = barebox-bcm2837-rpi-3.dtb }
- 		file bcm2837-rpi-3-a-plus.dtb { image = barebox-bcm2837-rpi-3.dtb }
- 		file bcm2837-rpi-3-b-plus.dtb { image = barebox-bcm2837-rpi-3.dtb }
- 		file bcm2837-rpi-cm3-io3.dtb { image = barebox-bcm2837-rpi-cm3.dtb }
+		file barebox.img { image = barebox-raspberry-pi.img }
 	}
 	size = 32M
 }
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index f1dff400a624..ec2f5212a71d 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -84,8 +84,8 @@ $(STATEDIR)/barebox-rpi2.targetinstall:
 	@$(foreach dtb, $(wildcard $(BAREBOX_RPI2_DTB_DIR)/*.dtb), \
 		install -m 644 \
 			$(dtb) $(IMAGEDIR)/barebox-$(notdir $(dtb))$(ptx/nl))
-	@install -m 644 $(BAREBOX_RPI2_BUILD_DIR)/images/barebox-dt-2nd.img \
-			$(IMAGEDIR)/barebox-dt-2nd-rpi.img
+	@install -m 644 $(BAREBOX_RPI2_BUILD_DIR)/images/barebox-raspberry-pi.img \
+			$(IMAGEDIR)/barebox-raspberry-pi.img
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-- 
2.30.2