Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

global: create DIGI_SOM variable and reformulate DIGI_FAMILY variable 

Certain platforms share a processor family but need to be differentiated
between them. DEY was using the variable DIGI_FAMILY as the SOM name
rather than the family. It becomes useful to have both (DIGI_SOM as the
more specific, and DIGI_FAMILY as the more generic).

This is the case, for example, of:

- ccmp1 (family)
  - ccmp15 (SOM)
  - ccmp13 (SOM)
- ccimx8m (family)
  - ccimx8mm (SOM)
  - ccimx8mn (SOM)

Both variables are used on the machine overrides.
Where DIGI_FAMILY was used, use now DIGI_SOM.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2023-02-13 11:37:37 +01:00
parent 39dd22c471
commit 9b165196bb
18 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/classes/image_types_digi.bbclass
View File

@ -207,7 +207,7 @@ trustence_sign_cpio() {
[ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}" [ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}"
# Sign/encrypt the ramdisk # Sign/encrypt the ramdisk
trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -i "${1}" "${1}.tf" trustfence-sign-artifact.sh -p "${DIGI_SOM}" -i "${1}" "${1}.tf"
else else
# Copy the image with no changes # Copy the image with no changes
cp "${1}" "${1}.tf" cp "${1}" "${1}.tf"
@ -231,7 +231,7 @@ rootfs_sign() {
ROOTFS_IMAGE="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.squashfs" ROOTFS_IMAGE="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.squashfs"
TMP_ROOTFS_IMAGE_SIGNED="$(mktemp ${ROOTFS_IMAGE}-signed.XXXXXX)" TMP_ROOTFS_IMAGE_SIGNED="$(mktemp ${ROOTFS_IMAGE}-signed.XXXXXX)"
# Sign rootfs read-only image # Sign rootfs read-only image
trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -r "${ROOTFS_IMAGE}" "${TMP_ROOTFS_IMAGE_SIGNED}" trustfence-sign-artifact.sh -p "${DIGI_SOM}" -r "${ROOTFS_IMAGE}" "${TMP_ROOTFS_IMAGE_SIGNED}"
mv "${TMP_ROOTFS_IMAGE_SIGNED}" "${ROOTFS_IMAGE}" mv "${TMP_ROOTFS_IMAGE_SIGNED}" "${ROOTFS_IMAGE}"
} }

2
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -2,6 +2,8 @@
#@NAME: ConnectCore 6 QuadPlus Single Board Computer. #@NAME: ConnectCore 6 QuadPlus Single Board Computer.
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 QuadPlus SBC. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 QuadPlus SBC.
DIGI_SOM = "ccimx6qp"
# Include the machine configuration for Digi's ConnectCore 6 module. # Include the machine configuration for Digi's ConnectCore 6 module.
include conf/machine/include/ccimx6.inc include conf/machine/include/ccimx6.inc

2
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -2,6 +2,8 @@
#@NAME: ConnectCore 6 Single Board Computer. #@NAME: ConnectCore 6 Single Board Computer.
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 SBC. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 SBC.
DIGI_SOM = "ccimx6"
# Contains the ConnectCore 6 module. # Contains the ConnectCore 6 module.
include conf/machine/include/ccimx6.inc include conf/machine/include/ccimx6.inc

4
meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
View File

@ -2,8 +2,8 @@
#@NAME: ConnectCore 8M Mini Development Kit. #@NAME: ConnectCore 8M Mini Development Kit.
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 8M Mini DVK. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 8M Mini DVK.
DIGI_FAMILY = "ccimx8mm" DIGI_SOM = "ccimx8mm"
MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:ccimx8m:${DIGI_FAMILY}:" MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:${DIGI_FAMILY}:${DIGI_SOM}:"
# Include the machine configuration for Digi's ConnectCore 8M module. # Include the machine configuration for Digi's ConnectCore 8M module.
include conf/machine/include/ccimx8m.inc include conf/machine/include/ccimx8m.inc

4
meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
View File

@ -2,8 +2,8 @@
#@NAME: ConnectCore 8M Nano Development Kit. #@NAME: ConnectCore 8M Nano Development Kit.
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 8M Nano DVK. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 8M Nano DVK.
DIGI_FAMILY = "ccimx8mn" DIGI_SOM = "ccimx8mn"
MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:ccimx8m:${DIGI_FAMILY}:" MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:${DIGI_FAMILY}:${DIGI_SOM}:"
# Include the machine configuration for Digi's ConnectCore 8M module. # Include the machine configuration for Digi's ConnectCore 8M module.
include conf/machine/include/ccimx8m.inc include conf/machine/include/ccimx8m.inc

5
meta-digi-arm/conf/machine/ccimx93-dvk.conf
View File

@ -2,8 +2,13 @@
#@NAME: ConnectCore 93 Development Kit #@NAME: ConnectCore 93 Development Kit
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 DVK #@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 DVK
DIGI_SOM = "ccimx93"
require include/ccimx93.inc require include/ccimx93.inc
MACHINEOVERRIDES =. "${DIGI_FAMILY}:${DIGI_SOM}:"
MACHINEOVERRIDES =. "mx93:"
# U-Boot configurations # U-Boot configurations
UBOOT_CONFIG ??= "ccimx93-dvk" UBOOT_CONFIG ??= "ccimx93-dvk"
UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig" UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig"

4
meta-digi-arm/conf/machine/ccmp13-dvk.conf
View File

@ -6,11 +6,13 @@
# Include the machine configuration for Digi's ConnectCore MP1. # Include the machine configuration for Digi's ConnectCore MP1.
include conf/machine/include/ccmp1.inc include conf/machine/include/ccmp1.inc
DIGI_SOM = "ccmp13"
# ========================================================================= # =========================================================================
# Chip architecture # Chip architecture
# ========================================================================= # =========================================================================
DEFAULTTUNE = "cortexa7thf-neon-vfpv4" DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:ccmp13:ccmp13-dvk" MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:${DIGI_SOM}:ccmp13-dvk"
# ========================================================================= # =========================================================================
# boot device # boot device

4
meta-digi-arm/conf/machine/ccmp15-dvk.conf
View File

@ -6,11 +6,13 @@
# Include the machine configuration for Digi's ConnectCore MP1. # Include the machine configuration for Digi's ConnectCore MP1.
include conf/machine/include/ccmp1.inc include conf/machine/include/ccmp1.inc
DIGI_SOM = "ccmp15"
# ========================================================================= # =========================================================================
# Chip architecture # Chip architecture
# ========================================================================= # =========================================================================
DEFAULTTUNE = "cortexa7thf-neon-vfpv4" DEFAULTTUNE = "cortexa7thf-neon-vfpv4"
MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:ccmp15:ccmp15-dvk" MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAMILY}:${DIGI_SOM}:ccmp15-dvk"
# ========================================================================= # =========================================================================
# boot device # boot device

2
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 module. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 module.
DIGI_FAMILY = "ccimx6" DIGI_FAMILY = "ccimx6"
MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:${DIGI_FAMILY}:" MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:${DIGI_FAMILY}:${DIGI_SOM}:"
include conf/machine/include/imx-digi-base.inc include conf/machine/include/imx-digi-base.inc
include conf/machine/include/arm/armv7a/tune-cortexa9.inc include conf/machine/include/arm/armv7a/tune-cortexa9.inc

3
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -2,8 +2,9 @@
#@NAME: ConnectCore for i.MX6UL. #@NAME: ConnectCore for i.MX6UL.
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6UL. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6UL.
DIGI_SOM = "ccimx6ul"
DIGI_FAMILY = "ccimx6ul" DIGI_FAMILY = "ccimx6ul"
MACHINEOVERRIDES =. "mx6:mx6ul:${DIGI_FAMILY}:" MACHINEOVERRIDES =. "mx6:mx6ul:${DIGI_FAMILY}:${DIGI_SOM}:"
include conf/machine/include/imx-digi-base.inc include conf/machine/include/imx-digi-base.inc
include conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/arm/armv7a/tune-cortexa7.inc

2
meta-digi-arm/conf/machine/include/ccimx8m.inc
View File

@ -5,6 +5,8 @@
include conf/machine/include/imx-digi-base.inc include conf/machine/include/imx-digi-base.inc
require conf/machine/include/arm/armv8a/tune-cortexa53.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc
DIGI_FAMILY = "ccimx8m"
# Platform u-boot settings # Platform u-boot settings
UBOOT_PREFIX = "imx-boot" UBOOT_PREFIX = "imx-boot"
UBOOT_SUFFIX = "bin" UBOOT_SUFFIX = "bin"

3
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -2,8 +2,9 @@
#@NAME: ConnectCore 8X module. #@NAME: ConnectCore 8X module.
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 8X module. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 8X module.
DIGI_SOM = "ccimx8x"
DIGI_FAMILY = "ccimx8x" DIGI_FAMILY = "ccimx8x"
MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:${DIGI_FAMILY}:" MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:${DIGI_FAMILY}:${DIGI_SOM}:"
include conf/machine/include/imx-digi-base.inc include conf/machine/include/imx-digi-base.inc
include conf/machine/include/arm/armv8a/tune-cortexa35.inc include conf/machine/include/arm/armv8a/tune-cortexa35.inc

2
meta-digi-arm/conf/machine/include/ccimx93.inc
View File

@ -3,8 +3,6 @@
#@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 family of SOMs #@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 family of SOMs
DIGI_FAMILY = "ccimx93" DIGI_FAMILY = "ccimx93"
MACHINEOVERRIDES =. "${DIGI_FAMILY}:"
MACHINEOVERRIDES =. "mx93:"
require conf/machine/include/imx-digi-base.inc require conf/machine/include/imx-digi-base.inc
require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc

4
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -50,8 +50,8 @@ WLAN1_STATIC_NETMASK ?= "255.255.255.0"
P2P0_STATIC_IP ?= "192.168.45.30" P2P0_STATIC_IP ?= "192.168.45.30"
P2P0_STATIC_NETMASK ?= "255.255.255.0" P2P0_STATIC_NETMASK ?= "255.255.255.0"
WLAN_P2P_INTERFACE ?= "p2p0" WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ??= "${DIGI_FAMILY}-p2p" WLAN_P2P_DEVICE_NAME ??= "${DIGI_SOM}-p2p"
BT_DEVICE_NAME ??= "${DIGI_FAMILY}" BT_DEVICE_NAME ??= "${DIGI_SOM}"
# Digi BSP default settings # Digi BSP default settings
IMAGE_CLASSES = "image_types_digi" IMAGE_CLASSES = "image_types_digi"

2
meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb
View File

@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "36a02b956c288dad6ce6ecb2b13a4e6fb2983fd5c39cab5028ae9a7daf
S = "${WORKDIR}/${PN}-${PV}" S = "${WORKDIR}/${PN}-${PV}"
SC_FIRMWARE_NAME ?= "mx8x-${DIGI_FAMILY}-scfw-tcm.bin" SC_FIRMWARE_NAME ?= "mx8x-${DIGI_SOM}-scfw-tcm.bin"
symlink_name = "scfw_tcm.bin" symlink_name = "scfw_tcm.bin"
SYSROOT_DIRS += "/boot" SYSROOT_DIRS += "/boot"

4
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc
View File

@ -97,12 +97,12 @@ build_uboot_scripts() {
# Sign boot script # Sign boot script
TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/bootscr-signed.XXXXXX)" TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/bootscr-signed.XXXXXX)"
trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}" trustfence-sign-artifact.sh -p "${DIGI_SOM}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}"
mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/boot.scr" mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/boot.scr"
# Sign altboot script # Sign altboot script
TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/altboot-signed.XXXXXX)" TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/altboot-signed.XXXXXX)"
trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/altboot.scr" "${TMP_SIGNED_BOOTSCR}" trustfence-sign-artifact.sh -p "${DIGI_SOM}" -b "${DEPLOYDIR}/altboot.scr" "${TMP_SIGNED_BOOTSCR}"
mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/altboot.scr" mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/altboot.scr"
fi fi
} }

6
meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc
View File

@ -20,7 +20,7 @@ trustfence_sign() {
fi fi
TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)" TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)"
trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" trustfence-sign-artifact.sh -p "${DIGI_SOM}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}"
if [ "${type}" = "Image.gz" ]; then if [ "${type}" = "Image.gz" ]; then
# Compress the signed Image and restore the original filename # Compress the signed Image and restore the original filename
@ -41,9 +41,9 @@ trustfence_sign() {
TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)"
if [ "${DTB_EXT}" = "dtbo" ]; then if [ "${DTB_EXT}" = "dtbo" ]; then
trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -o "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" trustfence-sign-artifact.sh -p "${DIGI_SOM}" -o "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}"
else else
trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" trustfence-sign-artifact.sh -p "${DIGI_SOM}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}"
fi fi
mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}"
done done

4
meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend
View File

@ -67,9 +67,9 @@ do_install:append() {
sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd@.service sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd@.service
# Read-only rootfs: actions that substitute postinst script # Read-only rootfs: actions that substitute postinst script
# - append the ${DIGI_FAMILY} string to SSID # - append the ${DIGI_SOM} string to SSID
if [ -n "${@bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs', '1', '', d)}" ]; then if [ -n "${@bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs', '1', '', d)}" ]; then
sed -i -e "s,##MAC##,${DIGI_FAMILY},g" ${D}${sysconfdir}/hostapd_*.conf sed -i -e "s,##MAC##,${DIGI_SOM},g" ${D}${sysconfdir}/hostapd_*.conf
fi fi
} }