From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH 06/11] Add STM32MP15x eval board
Date: Tue, 13 Oct 2020 09:50:23 +0200 [thread overview]
Message-ID: <328d40486b8aa81aedfd92bb632dec78b5c8fbf1.1602575428.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1602575428.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
This adds another ARMv7 board, using buster this time. It's primary
purpose will be acting as a TF-A test target. It was chosen due to its
simplicity and clean upstream support.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/conf/local.conf.sample | 1 +
meta-isar/conf/machine/stm32mp15x.conf | 19 +++++++++++++++++++
.../conf/multiconfig/stm32mp15x-buster.conf | 7 +++++++
.../u-boot/u-boot-stm32mp15x_2020.10.bb | 6 ++++++
.../lib/wic/canned-wks/stm32mp15x.wks.in | 12 ++++++++++++
scripts/ci_build.sh | 1 +
6 files changed, 46 insertions(+)
create mode 100644 meta-isar/conf/machine/stm32mp15x.conf
create mode 100644 meta-isar/conf/multiconfig/stm32mp15x-buster.conf
create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb
create mode 100644 meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 01666fd4..de1c6a87 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -60,6 +60,7 @@ BBMULTICONFIG = " \
hikey-stretch \
nand-ubi-demo-buster \
nanopi-neo-buster \
+ stm32mp15x-buster \
rpi-stretch \
sifive-fu540-sid-ports \
"
diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf
new file mode 100644
index 00000000..7ef36e68
--- /dev/null
+++ b/meta-isar/conf/machine/stm32mp15x.conf
@@ -0,0 +1,19 @@
+#
+# Copyright (c) Siemens AG, 2020
+#
+# SPDX-License-Identifier: MIT
+
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "mainline"
+
+PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x"
+U_BOOT_CONFIG_stm32mp15x = "stm32mp15_basic_defconfig"
+U_BOOT_BIN_stm32mp15x = "u-boot-spl.stm32 u-boot.img"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "stm32mp15x.wks.in"
+IMAGER_INSTALL += "u-boot-stm32mp15x"
+IMAGER_BUILD_DEPS += "u-boot-stm32mp15x"
+
+IMAGE_INSTALL += "u-boot-script"
diff --git a/meta-isar/conf/multiconfig/stm32mp15x-buster.conf b/meta-isar/conf/multiconfig/stm32mp15x-buster.conf
new file mode 100644
index 00000000..d1b76d0f
--- /dev/null
+++ b/meta-isar/conf/multiconfig/stm32mp15x-buster.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2020
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE = "stm32mp15x"
+DISTRO = "debian-buster"
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb
new file mode 100644
index 00000000..6d956434
--- /dev/null
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb
@@ -0,0 +1,6 @@
+#
+# Copyright (c) Siemens AG, 2020
+#
+# SPDX-License-Identifier: MIT
+
+require u-boot-${PV}.inc
diff --git a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in
new file mode 100644
index 00000000..a8dc3727
--- /dev/null
+++ b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in
@@ -0,0 +1,12 @@
+#
+# Copyright (c) Siemens AG, 2020
+#
+# SPDX-License-Identifier: MIT
+
+part fsbl1 --label fsbl1 --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/u-boot-spl.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K
+part fsbl2 --label fsbl2 --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/u-boot-spl.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K
+part ssbl --label ssbl --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/u-boot.img" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 2048K
+
+part / --source rootfs-u-boot --fstype ext4 --label root --align 1024 --active --use-uuid
+
+bootloader --ptable gpt --append="rootwait rw console=ttySTM0,115200"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index f1f6503e..0053809c 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -49,6 +49,7 @@ CROSS_TARGETS_SET="\
mc:qemuarm64-stretch:isar-image-base \
mc:qemuamd64-stretch:isar-image-base \
mc:de0-nano-soc-buster:isar-image-base \
+ mc:stm32mp15x-buster:isar-image-base \
mc:rpi-stretch:isar-image-base"
CROSS_TARGETS_SET_BULLSEYE="\
--
2.26.2
next prev parent reply other threads:[~2020-10-13 7:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 7:50 [PATCH 00/11] Support for building TF-A and OP-TEE, add STM32MP15x board Jan Kiszka
2020-10-13 7:50 ` [PATCH 01/11] meta-isar: Lift de0-nano-soc build to buster Jan Kiszka
2020-10-13 7:50 ` [PATCH 02/11] meta-isar: linux-mainline: Update to latest 5.4.70 Jan Kiszka
2020-10-13 7:50 ` [PATCH 03/11] meta-isar: u-boot: Update to 2020.10 Jan Kiszka
2020-10-13 7:50 ` [PATCH 04/11] meta-isar: u-boot: Factor our de0-nano-soc recipe Jan Kiszka
2020-10-13 7:50 ` [PATCH 05/11] meta-isar: example-raw: Purge securetty from target image Jan Kiszka
2020-10-13 7:50 ` Jan Kiszka [this message]
2020-10-13 7:50 ` [PATCH 07/11] Add recipe include for building custom Trusted Firmware A Jan Kiszka
2020-10-13 7:50 ` [PATCH 08/11] stm32mp15x: Switch to TF-A based boot Jan Kiszka
2020-10-13 7:50 ` [PATCH 09/11] Add recipe include for building custom OP-TEE Jan Kiszka
2020-10-13 7:50 ` [PATCH 10/11] meta-isar: linux-mainline: Add patches for stm32mp15x target Jan Kiszka
2020-10-13 7:50 ` [PATCH 11/11] meta-isar: Add OP-TEE to STM32MP15x board Jan Kiszka
2020-10-13 8:01 ` [PATCH 00/11] Support for building TF-A and OP-TEE, add " Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=328d40486b8aa81aedfd92bb632dec78b5c8fbf1.1602575428.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox