From 9b165196bb21644e5c053fbc3c20cc13f3b171cf Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 13 Feb 2023 11:37:37 +0100 Subject: [PATCH] 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 --- meta-digi-arm/classes/image_types_digi.bbclass | 4 ++-- meta-digi-arm/conf/machine/ccimx6qpsbc.conf | 2 ++ meta-digi-arm/conf/machine/ccimx6sbc.conf | 2 ++ meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 4 ++-- meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 4 ++-- meta-digi-arm/conf/machine/ccimx93-dvk.conf | 5 +++++ meta-digi-arm/conf/machine/ccmp13-dvk.conf | 4 +++- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 4 +++- meta-digi-arm/conf/machine/include/ccimx6.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 3 ++- meta-digi-arm/conf/machine/include/ccimx8m.inc | 2 ++ meta-digi-arm/conf/machine/include/ccimx8x.inc | 3 ++- meta-digi-arm/conf/machine/include/ccimx93.inc | 2 -- meta-digi-arm/conf/machine/include/digi-defaults.inc | 4 ++-- .../recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc | 6 +++--- .../recipes-connectivity/hostapd/hostapd_%.bbappend | 4 ++-- 18 files changed, 38 insertions(+), 23 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 9691b0921..6989cbe2a 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -207,7 +207,7 @@ trustence_sign_cpio() { [ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}" # 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 # Copy the image with no changes cp "${1}" "${1}.tf" @@ -231,7 +231,7 @@ rootfs_sign() { ROOTFS_IMAGE="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.squashfs" TMP_ROOTFS_IMAGE_SIGNED="$(mktemp ${ROOTFS_IMAGE}-signed.XXXXXX)" # 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}" } diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index c43460a8e..c468d2cd9 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -2,6 +2,8 @@ #@NAME: ConnectCore 6 QuadPlus Single Board Computer. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 QuadPlus SBC. +DIGI_SOM = "ccimx6qp" + # Include the machine configuration for Digi's ConnectCore 6 module. include conf/machine/include/ccimx6.inc diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index b3d6f539b..4cea9442c 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -2,6 +2,8 @@ #@NAME: ConnectCore 6 Single Board Computer. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 SBC. +DIGI_SOM = "ccimx6" + # Contains the ConnectCore 6 module. include conf/machine/include/ccimx6.inc diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index a6863c8eb..cbe10eec6 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -2,8 +2,8 @@ #@NAME: ConnectCore 8M Mini Development Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 8M Mini DVK. -DIGI_FAMILY = "ccimx8mm" -MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:ccimx8m:${DIGI_FAMILY}:" +DIGI_SOM = "ccimx8mm" +MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:${DIGI_FAMILY}:${DIGI_SOM}:" # Include the machine configuration for Digi's ConnectCore 8M module. include conf/machine/include/ccimx8m.inc diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index da1583982..dc3a97a43 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -2,8 +2,8 @@ #@NAME: ConnectCore 8M Nano Development Kit. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 8M Nano DVK. -DIGI_FAMILY = "ccimx8mn" -MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:ccimx8m:${DIGI_FAMILY}:" +DIGI_SOM = "ccimx8mn" +MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:${DIGI_FAMILY}:${DIGI_SOM}:" # Include the machine configuration for Digi's ConnectCore 8M module. include conf/machine/include/ccimx8m.inc diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf index 9f193904e..c4738bb13 100644 --- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf @@ -2,8 +2,13 @@ #@NAME: ConnectCore 93 Development Kit #@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 DVK +DIGI_SOM = "ccimx93" + require include/ccimx93.inc +MACHINEOVERRIDES =. "${DIGI_FAMILY}:${DIGI_SOM}:" +MACHINEOVERRIDES =. "mx93:" + # U-Boot configurations UBOOT_CONFIG ??= "ccimx93-dvk" UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig" diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index f46326f39..88370bb26 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -6,11 +6,13 @@ # Include the machine configuration for Digi's ConnectCore MP1. include conf/machine/include/ccmp1.inc +DIGI_SOM = "ccmp13" + # ========================================================================= # Chip architecture # ========================================================================= 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 diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 11e378e24..86b8ad1c7 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -6,11 +6,13 @@ # Include the machine configuration for Digi's ConnectCore MP1. include conf/machine/include/ccmp1.inc +DIGI_SOM = "ccmp15" + # ========================================================================= # Chip architecture # ========================================================================= 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 diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 38882221d..403b38dd0 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 module. 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/arm/armv7a/tune-cortexa9.inc diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 91c661949..1065b5fb7 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -2,8 +2,9 @@ #@NAME: ConnectCore for i.MX6UL. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 6UL. +DIGI_SOM = "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/arm/armv7a/tune-cortexa7.inc diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc index b16546ddf..99bc0fd59 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8m.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc @@ -5,6 +5,8 @@ include conf/machine/include/imx-digi-base.inc require conf/machine/include/arm/armv8a/tune-cortexa53.inc +DIGI_FAMILY = "ccimx8m" + # Platform u-boot settings UBOOT_PREFIX = "imx-boot" UBOOT_SUFFIX = "bin" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index de3e67177..58f80e01d 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -2,8 +2,9 @@ #@NAME: ConnectCore 8X module. #@DESCRIPTION: Machine configuration for Digi's ConnectCore 8X module. +DIGI_SOM = "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/arm/armv8a/tune-cortexa35.inc diff --git a/meta-digi-arm/conf/machine/include/ccimx93.inc b/meta-digi-arm/conf/machine/include/ccimx93.inc index 9fd452fa8..25e8a2568 100644 --- a/meta-digi-arm/conf/machine/include/ccimx93.inc +++ b/meta-digi-arm/conf/machine/include/ccimx93.inc @@ -3,8 +3,6 @@ #@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 family of SOMs DIGI_FAMILY = "ccimx93" -MACHINEOVERRIDES =. "${DIGI_FAMILY}:" -MACHINEOVERRIDES =. "mx93:" require conf/machine/include/imx-digi-base.inc require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 6a1a7bbe4..af46097ae 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -50,8 +50,8 @@ WLAN1_STATIC_NETMASK ?= "255.255.255.0" P2P0_STATIC_IP ?= "192.168.45.30" P2P0_STATIC_NETMASK ?= "255.255.255.0" WLAN_P2P_INTERFACE ?= "p2p0" -WLAN_P2P_DEVICE_NAME ??= "${DIGI_FAMILY}-p2p" -BT_DEVICE_NAME ??= "${DIGI_FAMILY}" +WLAN_P2P_DEVICE_NAME ??= "${DIGI_SOM}-p2p" +BT_DEVICE_NAME ??= "${DIGI_SOM}" # Digi BSP default settings IMAGE_CLASSES = "image_types_digi" diff --git a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb index 64875ed1d..ed6649a55 100644 --- a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb +++ b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.11.0.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "36a02b956c288dad6ce6ecb2b13a4e6fb2983fd5c39cab5028ae9a7daf 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" SYSROOT_DIRS += "/boot" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 01b67f094..be252ce5f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -97,12 +97,12 @@ build_uboot_scripts() { # Sign boot script 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" # Sign altboot script 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" fi } diff --git a/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc b/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc index 99bdc27c4..0d4551eef 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-trustfence.inc @@ -20,7 +20,7 @@ trustfence_sign() { fi 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 # Compress the signed Image and restore the original filename @@ -41,9 +41,9 @@ trustfence_sign() { TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" 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 - 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 mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" done diff --git a/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend b/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend index 157e18fdd..f3609e60c 100644 --- a/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend @@ -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 # 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 - 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 }