From 4b263e2f4c3a174222e9a4afe35d89f6d86a2553 Mon Sep 17 00:00:00 2001
From: Etienne Carriere <etienne.carriere@linaro.org>
Date: Thu, 30 Jun 2022 10:02:06 +0200
Subject: stm32mp1: build 135F-DK flavor

PLATFORM=stm32mp1-135F_DK is an stm32mp1 platform flavor integrating
STM32MP135F SoC on a development kit board with 512MB of DDR,
a SDcard, USB slots, an ethernet slot and few other interfaces.

Linux kernel source tree integrates the SoC with stm32mp135f-dk.dts
file. Stm32mp13 uses SCMI voltage domain protocol hence enabling
CONFIG_REGULATOR_ARM_SCMI in kernel configuration.

U-boot integrates the board DTS file and provides a MP13 dedicated
defconfig: stm32mp13_defconfig.

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
---
 .../stm32mp1-tz/genimage-STM32MP135F-DK.cfg        | 34 ++++++++++++++++++++++
 .../boot/extlinux/extlinux.conf                    |  6 ++++
 kconfigs/stm32mp1.conf                             |  1 +
 stm32mp1.mk                                        |  9 ++++--
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 br-ext/board/stmicroelectronics/stm32mp1-tz/genimage-STM32MP135F-DK.cfg
 create mode 100644 br-ext/board/stmicroelectronics/stm32mp1-tz/overlay-STM32MP135F-DK/boot/extlinux/extlinux.conf

diff --git a/br-ext/board/stmicroelectronics/stm32mp1-tz/genimage-STM32MP135F-DK.cfg b/br-ext/board/stmicroelectronics/stm32mp1-tz/genimage-STM32MP135F-DK.cfg
new file mode 100644
index 0000000..b458ff5
--- /dev/null
+++ b/br-ext/board/stmicroelectronics/stm32mp1-tz/genimage-STM32MP135F-DK.cfg
@@ -0,0 +1,34 @@
+image sdcard.img {
+	hdimage {
+		gpt = "true"
+	}
+
+	partition fsbl {
+		image = "tf-a-stm32mp135f-dk.stm32"
+		size = 256K
+	}
+
+	partition fip {
+		image = "fip.bin"
+		partition-type-uuid = L
+		size = 4M
+	}
+
+	partition u-boot-env {
+		partition-type-uuid = L
+		size = 4M
+	}
+
+	partition bootfs {
+		image = "bootfs.ext2"
+		partition-type-uuid = L
+		size = 32M
+		bootable = "yes"
+	}
+
+	partition rootfs {
+		image = "rootfs.ext2"
+		partition-type-uuid = L
+		size = 128M
+	}
+}
diff --git a/br-ext/board/stmicroelectronics/stm32mp1-tz/overlay-STM32MP135F-DK/boot/extlinux/extlinux.conf b/br-ext/board/stmicroelectronics/stm32mp1-tz/overlay-STM32MP135F-DK/boot/extlinux/extlinux.conf
new file mode 100644
index 0000000..990af59
--- /dev/null
+++ b/br-ext/board/stmicroelectronics/stm32mp1-tz/overlay-STM32MP135F-DK/boot/extlinux/extlinux.conf
@@ -0,0 +1,6 @@
+TIMEOUT 20
+DEFAULT stm32mp13-buildroot
+LABEL stm32mp13-buildroot
+  kernel /boot/uImage
+  devicetree /boot/stm32mp135f-dk.dtb
+  append root=/dev/mmcblk0p5 rootwait rw console=ttySTM0,115200 earlyprintk
diff --git a/kconfigs/stm32mp1.conf b/kconfigs/stm32mp1.conf
index ff4a375..121eddb 100644
--- a/kconfigs/stm32mp1.conf
+++ b/kconfigs/stm32mp1.conf
@@ -3,5 +3,6 @@ CONFIG_OPTEE=y
 # SCMI support
 CONFIG_ARM_SCMI_PROTOCOL=y
 CONFIG_COMMON_CLK_SCMI=y
+CONFIG_REGULATOR_ARM_SCMI=y
 # CONFIG_SENSORS_ARM_SCMI is not set
 CONFIG_RESET_SCMI=y
diff --git a/stm32mp1.mk b/stm32mp1.mk
index 1ac97f1..9c0c6d3 100644
--- a/stm32mp1.mk
+++ b/stm32mp1.mk
@@ -33,11 +33,16 @@ STM32MP1_DTS_BASENAME	= stm32mp157c-ev1
 else ifeq ($(PLATFORM),stm32mp1-157C_ED1)
 BREXT_FLAVOR		= STM32MP157C-ED1
 STM32MP1_DTS_BASENAME	= stm32mp157c-ed1
+else ifeq ($(PLATFORM),stm32mp1-135F_DK)
+BREXT_FLAVOR		= STM32MP135F-DK
+STM32MP1_DTS_BASENAME	= stm32mp135f-dk
+STM32MP1_DEFCONFIG_U_BOOT = stm32mp13_defconfig
 else
 $(error Unknown PLATFORM $(PLATFORM))
 endif
 
 STM32MP1_DTS_U_BOOT ?= $(STM32MP1_DTS_BASENAME)
+STM32MP1_DEFCONFIG_U_BOOT ?= stm32mp15_defconfig
 
 ################################################################################
 # Binary images names
@@ -136,8 +141,8 @@ tfa-clean:
 U_BOOT_EXPORTS ?= CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)"
 
 u-boot:
-	$(U_BOOT_EXPORTS) $(MAKE) -C $(U_BOOT_PATH) stm32mp15_defconfig
-	$(U_BOOT_EXPORTS) $(MAKE) -C $(U_BOOT_PATH) DEVICE_TREE=$(STM32MP1_DTS_U_BOOT) all
+	$(U_BOOT_EXPORTS) $(MAKE) -C $(U_BOOT_PATH) $(STM32MP1_DEFCONFIG_U_BOOT)
+	$(U_BOOT_EXPORTS) $(MAKE) -C $(U_BOOT_PATH) DEVICE_TREE=$(STM32MP1_DTS_BASENAME) all
 	@$(call install_in_binaries,$(U_BOOT_PATH)/$(U_BOOT_BIN))
 	@$(call install_in_binaries,$(U_BOOT_PATH)/$(U_BOOT_DTB))
 
-- 
cgit v1.2.3