meta-digi-arm: add support for ConnectCore MP13 DVK platform

https://onedigi.atlassian.net/browse/DEL-8078

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>

meta-digi-arm/conf/machine/ccmp13-dvk.conf

@@ -0,0 +1,183 @@
+#@TYPE: Machine
+#@NAME: ccmp13-dvk
+#@DESCRIPTION: Configuration for Digi ConnectCore MP13 DVK
+#@NEEDED_BSPLAYERS: layers/meta-digi
+
+include conf/machine/include/st-machine-common-stm32mp.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
+include conf/machine/include/digi-defaults.inc
+
+# =========================================================================
+# Chip architecture
+# =========================================================================
+DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
+MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:ccmp1:ccmp13:ccmp13-dvk"
+
+# =========================================================================
+# boot device
+# =========================================================================
+# Configure the list of boards that enable NAND
+DEVICE_BOARD_ENABLE:NAND   += "ccmp13-dvk"
+
+# =========================================================================
+# U-Boot configs
+# =========================================================================
+# Last one is the default (the one the symlinks point at)
+UBOOT_CONFIG = "ccmp13_dvk"
+UBOOT_CONFIG[ccmp13_dvk] = "ccmp13_dvk_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
+
+# Platform U-Boot settings
+UBOOT_DTB_NAME = "ccmp13-dvk.dtb"
+UBOOT_PREFIX = "u-boot"
+UBOOT_SUFFIX = "bin"
+UBOOT_HAS_FASTBOOT = "false"
+
+# Set U-Boot FIP settings
+FIP_UBOOT_DTB = "u-boot"
+FIP_UBOOT_CONFIG = "optee"
+
+# =========================================================================
+# Machine settings
+# =========================================================================
+# Define list of devicetree per board
+STM32MP_DEVICETREE ??= "ccmp13-dvk"
+# Extra DTB for board - need to specify it with .dtb ...
+STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += "ccmp133-dvk.dtb"
+
+# =========================================================================
+# Machine features
+# =========================================================================
+MACHINE_FEATURES += "bluetooth"
+MACHINE_FEATURES += "wifi"
+MACHINE_FEATURES += "mca"
+
+# =========================================================================
+# Firmware
+# =========================================================================
+MACHINE_FIRMWARE:append = " firmware-murata firmware-murata-mfgtest"
+
+MACHINE_EXTRA_RRECOMMENDS += " \
+    ${MACHINE_FIRMWARE} \
+"
+
+# =========================================================================
+# Image
+# =========================================================================
+# Image FS types
+IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
+                                       "tar.bz2 boot.ubifs recovery.ubifs squashfs", \
+                                       "tar.bz2 ubifs boot.ubifs recovery.ubifs", d)}'
+
+# For populate_sdk, gcc-arm-none-eabi_9 has a python2 dependency, so we remove it.
+ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi"
+
+# =========================================================================
+# flashlayout
+# =========================================================================
+# Define the config labels to use to generate flashlayout file
+
+# =========================================================================
+# extlinux configuration
+# =========================================================================
+# As example, modify the default boot config for each target to M4 config
+
+# =========================================================================
+# Debug trace
+# =========================================================================
+# activate/deactivate the debug and trace on boot stage
+ST_DEBUG_TRACE = "0"
+
+# =========================================================================
+# trusted-firmware-a
+# =========================================================================
+# Configure trusted-firmware-a build
+TF_A_CONFIG = "optee nand usb"
+
+# =========================================================================
+# optee
+# =========================================================================
+# Map OPTEE configuration to device tree list
+OPTEE_CONF = "ccmp13-dvk"
+
+# =========================================================================
+# Flashlayouts
+# =========================================================================
+
+# =========================================================================
+# Kernel
+# =========================================================================
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_ALT_IMAGETYPE = "Image uImage vmlinux"
+KERNEL_DEFCONFIG ?= "ccmp1_defconfig"
+ST_KERNEL_LOADADDR ?= "0xC0008000"
+
+# =========================================================================
+# DEY settings
+# =========================================================================
+IMAGE_CLASSES = "image_types_digi image_types-stubi"
+
+# U-Boot environment offset (within partition)
+UBOOT_ENV_OFFSET ?= "0x0"
+# U-Boot environment size
+UBOOT_ENV_SIZE ?= "0x20000"
+# U-Boot environment range: size (in hex) in the environment partition that
+# the U-Boot environment can take up (if undefined, it will take up all the
+# available space in the environment partition)
+UBOOT_ENV_RANGE ?= ""
+
+STORAGE_MEDIA = "mtd"
+
+# mkfs.ubifs parameters for boot partition (the one holding kernel and device tree files)
+# Max LEB count (-c 255) calculated for a partition of up to 32 MiB considering 128 KiB erase-block size.
+MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 255"
+
+# mkfs.ubifs parameters for rootfs partition
+# Max LEB count (-c 8191) calculated for a partition of up to 1 GiB considering 128 KiB erase-block size.
+MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191"
+
+# Enable STM specific features
+DEY_BUILD_PLATFORM = "STM"
+
+# Wireless external module
+HAS_WIFI_VIRTWLANS = "true"
+
+# Remove additional bluetooth packages
+MACHINE_BLUETOOTH_EXTRA_INSTALL = ""
+
+# =========================================================================
+# alsa
+# =========================================================================
+ALSA_LIST = ""
+
+# =========================================================================
+# DISTRO features
+# =========================================================================
+DISTRO_FEATURES:remove = " opengl "
+DISTRO_FEATURES:remove = " x11 "
+
+# add support of optee
+DISTRO_FEATURES:append = " optee "
+
+# add support of splashscreen
+#DISTRO_FEATURES:append = " splashscreen "
+
+# add support of systemd
+DISTRO_FEATURES:append = " systemd "
+
+# add support of efi
+DISTRO_FEATURES:append = " efi "
+
+# add support of InitRD installation package
+DISTRO_FEATURES:append = " initrd "
+
+# add support to pulseaudio
+DISTRO_FEATURES:append = "pulseaudio"
+
+# Disabling sysvinit
+DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
+
+VIRTUAL-RUNTIME_init_manager = "systemd"
+VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
+
+# Disable use of vendorfs partition
+ST_VENDORFS = "0"

meta-digi-arm/conf/machine/include/digi-defaults.inc

@@ -13,12 +13,13 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 # -------------------------------------------------
 # ccimx6        5.4               2017.03
 # ccimx6qp      5.4               2017.03
-# ccimx6ul      5.4               2020.04
+# ccimx6ul      5.15              2020.04
 # ccimx8x       5.4               2020.04 (packaged in imx-boot)
 # ccimx8mn      5.4               2020.04 (packaged in imx-boot)
 # ccimx8mm      5.4               2020.04 (packaged in imx-boot)
 # ccimx8mp      5.10              2021.04 (packaged in imx-boot)
-# ccmp15        5.10              2021.04
+# ccmp15        5.15              2021.10
+# ccmp13        5.15              2021.10
 #
 
 # Help variables used in recipes

sdk/build-github.sh

@@ -33,6 +33,7 @@ AVAILABLE_PLATFORMS=" \
 		     ccimx6ulsbc \
 		     ccimx6ulstarter \
 		     ccmp15-dvk \
+		     ccmp13-dvk \
 "
 
 MANIFEST_URL="https://github.com/digi-embedded/dey-manifest.git"
@@ -150,6 +151,7 @@ done<<-_EOF_
 	ccimx6ulsbc          dey-image-qt
 	ccimx6ulstarter      core-image-base
 	ccmp15-dvk           dey-image-qt
+	ccmp13-dvk           core-image-base
 _EOF_
 
 YOCTO_IMGS_DIR="${WORKSPACE}/images"

sdk/build.sh

@@ -184,6 +184,7 @@ done<<-_EOF_
 	ccimx6ulsom          DONTBUILDVARIANTS   dey-image-mft-module-min
 	ccimx6ulrftest       DONTBUILDVARIANTS   dey-image-mft-module-rf
 	ccmp15-dvk           DONTBUILDVARIANTS   dey-image-qt,dey-image-aws,dey-image-crank
+	ccmp13-dvk           DONTBUILDVARIANTS   core-image-base
 _EOF_
 
 YOCTO_IMGS_DIR="${WORKSPACE}/images"

sdk/config/ccmp13-dvk/bblayers.conf.sample

@@ -0,0 +1,23 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-yocto-bsp \
+  ##DIGIBASE##/meta-openembedded/meta-oe \
+  ##DIGIBASE##/meta-openembedded/meta-python \
+  ##DIGIBASE##/meta-openembedded/meta-networking \
+  ##DIGIBASE##/meta-openembedded/meta-webserver \
+  ##DIGIBASE##/meta-qt5 \
+  ##DIGIBASE##/meta-swupdate \
+  ##DIGIBASE##/meta-webkit \
+  ##DIGIBASE##/meta-timesys \
+  ##DIGIBASE##/meta-st-stm32mp \
+  ##DIGIBASE##/meta-digi/meta-digi-arm \
+  ##DIGIBASE##/meta-digi/meta-digi-dey \
+  "

sdk/config/ccmp13-dvk/conf-notes.txt

@@ -0,0 +1,6 @@
+Digi Embedded Yocto provides the following image recipes:
+
+  * core-image-base: a console-only image
+
+    Expansion of native core-image-base by including all the support for the
+    target device hardware like firmware files, rootfs customizations, etc.

sdk/config/ccmp13-dvk/local.conf.sample

@@ -0,0 +1,293 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at
+# local.conf.sample.extended which contains other examples of configuration which
+# can be placed in this file but new users likely won't need any of them
+# initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemumips64"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone-yocto"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86-64 if no other machine is selected:
+#MACHINE ??= "qemux86-64"
+
+MACHINE = "ccmp13-dvk"
+
+#
+# Use Digi's internal git repositories
+#
+#DIGI_INTERNAL_GIT ?= "1"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing
+# these defaults.
+#
+DISTRO ?= "dey"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends
+# can be enabled at once and the first item listed in the variable will be used
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+PACKAGE_CLASSES ?= "package_rpm"
+
+#
+# SDK target architecture
+#
+# This variable specifies the architecture to build SDK items for and means
+# you can build the SDK packages for architectures other than the machine you are
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686, x86_64, aarch64
+#SDKMACHINE ?= "i686"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "src-pkgs"       - add -src packages for all installed packages
+#                     (adds source code for debugging)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable
+# are:
+#   - 'buildstats' collect build statistics
+USER_CLASSES ?= "buildstats"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. It can also
+# run tests against any SDK that are built. To enable this uncomment these lines.
+# See classes/test{image,sdk}.bbclass for further details.
+#IMAGE_CLASSES += "testimage testsdk"
+#TESTIMAGE_AUTO:qemuall = "1"
+
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it
+# can launch an interactive shell. It needs to do this since the build is
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necessary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS ??= "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    HALT,${TMPDIR},100M,1K \
+    HALT,${DL_DIR},100M,1K \
+    HALT,${SSTATE_DIR},100M,1K \
+    HALT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can be
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as https or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+#
+# Yocto Project SState Mirror
+#
+# The Yocto Project has prebuilt artefacts available for its releases, you can enable
+# use of these by uncommenting the following lines. This will mean the build uses
+# the network to check for artefacts at the start of builds, which does slow it down
+# equally, it will also speed up the builds by not having to build things if they are
+# present in the cache. It assumes you can download something faster than you can build it
+# which will depend on your network.
+# Note: For this to work you also need hash-equivalence passthrough to the matching server
+#
+#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687"
+#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/4.0/PATH;downloadfilename=PATH"
+
+#
+# Qemu configuration
+#
+# By default native qemu will build with a builtin VNC server where graphical output can be
+# seen. The line below enables the SDL UI frontend too.
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
+# By default libsdl2-native will be built, if you want to use your host's libSDL instead of
+# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
+#ASSUME_PROVIDED += "libsdl2-native"
+
+# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
+# a handy set of menus for controlling the emulator.
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
+
+#
+# Hash Equivalence
+#
+# Enable support for automatically running a local hash equivalence server and
+# instruct bitbake to use a hash equivalence aware signature generator. Hash
+# equivalence improves reuse of sstate by detecting when a given sstate
+# artifact can be reused as equivalent, even if the current task hash doesn't
+# match the one that generated the artifact.
+#
+# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
+#
+#BB_HASHSERVE = "auto"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+#
+# Memory Resident Bitbake
+#
+# Bitbake's server component can stay in memory after the UI for the current command
+# has completed. This means subsequent commands can run faster since there is no need
+# for bitbake to reload cache files and so on. Number is in seconds, after which the
+# server will shut down.
+#
+#BB_SERVER_TIMEOUT = "60"
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "2"
+
+#
+# Enable local PR server
+#
+PRSERV_HOST = "localhost:0"
+
+#
+# Some packages are covered by STM EULA
+#
+#ACCEPT_EULA_ccmp13-dvk = "1"

sdk/mkproject.sh

@@ -94,7 +94,7 @@ do_license() {
 		${MKP_SCRIPTPATH}/sources/meta-digi/meta-digi-arm/DIGI_EULA \
 		${MKP_SCRIPTPATH}/sources/meta-digi/meta-digi-arm/DIGI_OPEN_EULA \
 	"
-	if [ "${MKP_PLATFORM}" = "ccmp15-dvk" ]; then
+	if [ "${MKP_PLATFORM}" = "ccmp15-dvk" ] || [ "${MKP_PLATFORM}" = "ccmp13-dvk" ]; then
 		local SOC_VENDOR="STM"
 		MKP_LICENSE_FILES=" \
 			${MKP_LICENSE_FILES} \