diff --git a/Dockerfile b/Dockerfile
index 83371b6..a4fecb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ RUN apt-get update \
make patch repo sudo texinfo vim-tiny wget whiptail libelf-dev git-lfs screen \
socket corkscrew curl xz-utils tcl libtinfo5 device-tree-compiler python3-pip python3-dev \
tmux libncurses-dev vim zstd lz4 liblz4-tool libc6-dev-i386 \
- awscli docker-compose gosu xvfb python3-cairo python3-gi-cairo yaru-theme-icon \
+ awscli docker-compose gosu xvfb python3-cairo python3-gi-cairo yaru-theme-icon tree rsync \
&& ln -s /usr/bin/python3 /usr/bin/python \
&& pip3 --no-cache-dir install expandvars jsonFormatter \
&& apt-get autoremove -y \
diff --git a/conf/bblayers-bsp.inc b/conf/bblayers-bsp.inc
index fbdf77a..761faf4 100644
--- a/conf/bblayers-bsp.inc
+++ b/conf/bblayers-bsp.inc
@@ -18,6 +18,7 @@ BSPLAYERS = " \
${OEROOT}/layers/meta-xilinx-tools \
${OEROOT}/layers/meta-tegra \
${OEROOT}/layers/meta-ti/meta-ti-bsp \
+ ${OEROOT}/layers/meta-ti/meta-ti-extras \
${OEROOT}/layers/meta-st-stm32mp \
${OEROOT}/layers/meta-lmp/meta-lmp-bsp \
"
diff --git a/conf/local.conf b/conf/local.conf
index 0978f28..b70ed8c 100644
--- a/conf/local.conf
+++ b/conf/local.conf
@@ -101,18 +101,18 @@ UEFI_SIGN_KEYDIR[vardepsexclude] += "TOPDIR"
#UEFI_SIGN_ENABLE ?= "1"
#
-# Fix Code Aurora mirrors
-#
-# Revert v90
-MIRRORS += " \
- git://source.codeaurora.org/external/imx/ git://github.com/nxp-imx/ \n \
- https://source.codeaurora.org/external/imx/ https://github.com/nxp-imx/ \n \
- http://source.codeaurora.org/external/imx/ http://github.com/nxp-imx/ \n \
- gitsm://source.codeaurora.org/external/imx/ gitsm://github.com/nxp-imx/ \n \
-"
+# STM32CubeProgrammer STM32MP Signing Tool configuration
+#
+#STM32_ROT_SIGN_ENABLE ??= "1"
+#STM32_CUBE_PATH ??= "/usr/local/STMicroelectronics/STM32Cube/STM32CubeProgrammer"
+STM32_ROT_KEY_PATH ??= "${TOPDIR}/../tools/lmp-tools/security/stm32mp1/"
+STM32_ROT_KEY_PATH[vardepsexclude] += "TOPDIR"
+STM32_ROT_KEY_PASSWORD ??= "foundries"
-# Use gcc for some packages
+#
+# ARDUINO
+#
+# Extend non-clangable.inc
TOOLCHAIN:pn-imx-vpu-hantro = "gcc"
TOOLCHAIN:pn-bayer2rgb = "gcc"
TOOLCHAIN:pn-gstreamer1.0-bayer2rgb-neon = "gcc"
-
diff --git a/lmp-base.xml b/lmp-base.xml
index d1c296c..68973b8 100644
--- a/lmp-base.xml
+++ b/lmp-base.xml
@@ -5,17 +5,17 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/lmp-bsp.xml b/lmp-bsp.xml
index b474f07..fab98f4 100644
--- a/lmp-bsp.xml
+++ b/lmp-bsp.xml
@@ -6,14 +6,14 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
diff --git a/setup-environment-internal b/setup-environment-internal
index 8f09725..92b11ce 100644
--- a/setup-environment-internal
+++ b/setup-environment-internal
@@ -160,39 +160,42 @@ sha512sum "${MANIFESTS}"/setup-environment-internal 2>&1 > conf/checksum
if [ ! -f "conf/local.conf" ]; then
cp "${MANIFESTS}"/conf/local.conf conf/local.conf
fi
+
# Copy default development keys if not set by the user
-mkdir -p conf/keys
-if [ ! -f "conf/keys/dev.key" -a ! -f "conf/keys/dev.crt" ]; then
- ln -sf "${MANIFESTS}"/conf/keys/dev.key conf/keys/dev.key
- ln -sf "${MANIFESTS}"/conf/keys/dev.crt conf/keys/dev.crt
-fi
-# Copy default SPL development keys if not set by the user
-if [ ! -f "conf/keys/spldev.key" -a ! -f "conf/keys/spldev.crt" ]; then
- ln -sf "${MANIFESTS}"/conf/keys/spldev.key conf/keys/spldev.key
- ln -sf "${MANIFESTS}"/conf/keys/spldev.crt conf/keys/spldev.crt
-fi
-# Copy default u-boot development keys if not set by the user
-if [ ! -f "conf/keys/ubootdev.key" -a ! -f "conf/keys/ubootdev.crt" ]; then
- ln -sf "${MANIFESTS}"/conf/keys/ubootdev.key conf/keys/ubootdev.key
- ln -sf "${MANIFESTS}"/conf/keys/ubootdev.crt conf/keys/ubootdev.crt
-fi
-# Copy default optee development keys if not set by the user
-if [ ! -f "conf/keys/opteedev.key" -a ! -f "conf/keys/opteedev.crt" ]; then
- ln -sf "${MANIFESTS}"/conf/keys/opteedev.key conf/keys/opteedev.key
- ln -sf "${MANIFESTS}"/conf/keys/opteedev.crt conf/keys/opteedev.crt
-fi
-# Copy default module kernel development keys if not set by the user
-if [ ! -f "conf/keys/privkey_modsign.pem" -a ! -f "conf/keys/x509_modsign.crt" ]; then
- ln -sf "${MANIFESTS}"/conf/keys/privkey_modsign.pem conf/keys/privkey_modsign.pem
- ln -sf "${MANIFESTS}"/conf/keys/x509_modsign.crt conf/keys/x509_modsign.crt
-fi
-# Link default TF-A development keys if not set by the user
-if [ ! -d "conf/keys/tf-a" ]; then
- ln -sf "${MANIFESTS}"/conf/keys/tf-a conf/keys/tf-a
-fi
-# Link default UEFI development keys and certificates if not set by the user
-if [ ! -d "conf/keys/uefi" ]; then
- ln -sf "${MANIFESTS}"/conf/keys/uefi conf/keys/uefi
+if [ -d "${MANIFESTS}"/conf/keys ]; then
+ mkdir -p conf/keys
+ if [ ! -f "conf/keys/dev.key" -a ! -f "conf/keys/dev.crt" ]; then
+ ln -sf "${MANIFESTS}"/conf/keys/dev.key conf/keys/dev.key
+ ln -sf "${MANIFESTS}"/conf/keys/dev.crt conf/keys/dev.crt
+ fi
+ # Copy default SPL development keys if not set by the user
+ if [ ! -f "conf/keys/spldev.key" -a ! -f "conf/keys/spldev.crt" ]; then
+ ln -sf "${MANIFESTS}"/conf/keys/spldev.key conf/keys/spldev.key
+ ln -sf "${MANIFESTS}"/conf/keys/spldev.crt conf/keys/spldev.crt
+ fi
+ # Copy default u-boot development keys if not set by the user
+ if [ ! -f "conf/keys/ubootdev.key" -a ! -f "conf/keys/ubootdev.crt" ]; then
+ ln -sf "${MANIFESTS}"/conf/keys/ubootdev.key conf/keys/ubootdev.key
+ ln -sf "${MANIFESTS}"/conf/keys/ubootdev.crt conf/keys/ubootdev.crt
+ fi
+ # Copy default optee development keys if not set by the user
+ if [ ! -f "conf/keys/opteedev.key" -a ! -f "conf/keys/opteedev.crt" ]; then
+ ln -sf "${MANIFESTS}"/conf/keys/opteedev.key conf/keys/opteedev.key
+ ln -sf "${MANIFESTS}"/conf/keys/opteedev.crt conf/keys/opteedev.crt
+ fi
+ # Copy default module kernel development keys if not set by the user
+ if [ ! -f "conf/keys/privkey_modsign.pem" -a ! -f "conf/keys/x509_modsign.crt" ]; then
+ ln -sf "${MANIFESTS}"/conf/keys/privkey_modsign.pem conf/keys/privkey_modsign.pem
+ ln -sf "${MANIFESTS}"/conf/keys/x509_modsign.crt conf/keys/x509_modsign.crt
+ fi
+ # Link default TF-A development keys if not set by the user
+ if [ ! -d "conf/keys/tf-a" ]; then
+ ln -sf "${MANIFESTS}"/conf/keys/tf-a conf/keys/tf-a
+ fi
+ # Link default UEFI development keys and certificates if not set by the user
+ if [ ! -d "conf/keys/uefi" ]; then
+ ln -sf "${MANIFESTS}"/conf/keys/uefi conf/keys/uefi
+ fi
fi
# Factory specific keys (unique per factory)
@@ -411,10 +414,17 @@ Some common targets are:
EOF
if [ "${DISTRO}" = 'lmp-mfgtool' ]; then
+ if [[ "${MACHINE}" == *"stm32mp1"* ]]; then
+ cat <