add RPI3 Support

Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>

4 files changed, 91 insertions, 1 deletions

diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index c09e911..47ad43b 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -43,7 +43,7 @@ BAREBOX_RPI2_CONF_OPT := $(call barebox-opts, BAREBOX_RPI2)
 BAREBOX_RPI2_MAKE_ENV := $(BAREBOX_RPI2_CONF_ENV)
 BAREBOX_RPI2_MAKE_OPT := $(BAREBOX_RPI2_CONF_OPT)
 
-BAREBOX_RPI2_IMAGES := images/barebox-raspberry-pi-2.img
+BAREBOX_RPI2_IMAGES := images/barebox-raspberry-pi-2.img images/barebox-raspberry-pi-3.img
 BAREBOX_RPI2_IMAGES := $(addprefix $(BAREBOX_RPI2_DIR)/,$(BAREBOX_RPI2_IMAGES))
 
 ifdef PTXCONF_BAREBOX_RPI2
diff --git a/configs/platform-v7a/rules/blspec-rpi3.make b/configs/platform-v7a/rules/blspec-rpi3.make
new file mode 100644
index 0000000..7d0fab6
--- /dev/null
+++ b/configs/platform-v7a/rules/blspec-rpi3.make
@@ -0,0 +1,38 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Rouven Czerwinski <r.czerwinski@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_BLSPEC_RPI3) += blspec-rpi3
+
+BLSPEC_RPI3_VERSION	:= 4.6
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/blspec-rpi3.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, blspec-rpi3)
+	@$(call install_fixup,blspec-rpi3,PRIORITY,optional)
+	@$(call install_fixup,blspec-rpi3,SECTION,base)
+	@$(call install_fixup,blspec-rpi3,AUTHOR,"Rouven Czerwinski <r.czerwinski@pengutronix.de>")
+	@$(call install_fixup,blspec-rpi3,DESCRIPTION,missing)
+
+	@$(call install_alternative, blspec-rpi3, 0, 0, 0644, \
+		/loader/entries/rpi3.conf)
+
+	@$(call install_finish,blspec-rpi3)
+
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make
index 6ca4827..e6b4e2e 100644
--- a/configs/platform-v7a/rules/image-rpi2.make
+++ b/configs/platform-v7a/rules/image-rpi2.make
@@ -26,6 +26,7 @@ IMAGE_RPI2_DATA		:= \
 	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \
 	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \
 	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.dat) \
+	$(wildcard $(IMAGE_RPI2_DATA_DIR)/*.dtb) \
 	$(wildcard $(IMAGE_RPI2_DATA_DIR)/config.txt)
 
 # ----------------------------------------------------------------------------
diff --git a/configs/platform-v7a/rules/image-rpi3.make b/configs/platform-v7a/rules/image-rpi3.make
new file mode 100644
index 0000000..600c406
--- /dev/null
+++ b/configs/platform-v7a/rules/image-rpi3.make
@@ -0,0 +1,51 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPI3) += image-rpi3
+
+#
+# Paths and names
+#
+IMAGE_RPI3		:= image-rpi3
+IMAGE_RPI3_DIR	:= $(BUILDDIR)/$(IMAGE_RPI3)
+IMAGE_RPI3_IMAGE	:= $(IMAGEDIR)/rpi3.hdimg
+IMAGE_RPI3_FILES	:= $(IMAGEDIR)/root.tgz
+IMAGE_RPI3_CONFIG	:= rpi3.config
+IMAGE_RPI3_DATA_DIR	:= $(call ptx/in-platformconfigdir, rpi-firmware)
+IMAGE_RPI3_DATA		:= \
+	$(wildcard $(IMAGE_RPI3_DATA_DIR)/*.bin) \
+	$(wildcard $(IMAGE_RPI3_DATA_DIR)/*.elf) \
+	$(wildcard $(IMAGE_RPI3_DATA_DIR)/*.dat) \
+	$(wildcard $(IMAGE_RPI3_DATA_DIR)/*.dtb) \
+	$(wildcard $(IMAGE_RPI3_DATA_DIR)/config.txt)
+
+# ----------------------------------------------------------------------------
+# Image
+# ----------------------------------------------------------------------------
+
+define squote_and_comma
+$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1))))
+endef
+
+IMAGE_RPI3_ENV := \
+        FIRMWARE_RPI3="$(call squote_and_comma,$(IMAGE_RPI3_DATA))"
+
+$(IMAGE_RPI3_IMAGE):
+	@$(call targetinfo)
+	@GPU_MEM=$(PTXCONF_IMAGE_RPI3_GPU_MEM) \
+		ptxd_replace_magic "$(IMAGE_RPI3_DATA_DIR)/config.txt" > \
+		"$(PTXDIST_TEMPDIR)/config.txt"
+	@$(call image/genimage, IMAGE_RPI3)
+	@$(call finish)
+
+# vim: syntax=make