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

ccmp1: move ccmp1 platform support to kernel 6.6 and U-Boot v2023.10 

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-9045
This commit is contained in:
Hector Palacios 2025-03-28 12:08:35 +01:00
parent 4da4eb7bdd
commit 9b3117aa34
5 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
# ccimx8mm 6.6 2024.04 (packaged in imx-boot)
# ccimx91 6.6 2024.04 (packaged in imx-boot)
# ccimx93 6.6 2024.04 (packaged in imx-boot)
# ccmp15 5.15 2021.10
# ccmp13 5.15 2021.10
# ccmp15 6.6 2023.10
# ccmp13 6.6 2023.10
# ccmp25 6.6 2023.10
#

35
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb
View File

@ -1,35 +0,0 @@
# Copyright (C) 2022-2024, Digi International Inc.
require u-boot-dey.inc
LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
DEPENDS += "flex-native bison-native"
DEPENDS += "python3-setuptools-native"
SRCBRANCH = "v2021.10/master"
SRCREV = "${AUTOREV}"
SRC_URI += " \
${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \
"
install_helper_files() {
# Install dtbs from UBOOT_DEVICETREE to datadir, so that kernel
# can use it for signing, and kernel will deploy after signs it.
if [ -n "${UBOOT_DEVICETREE}" ]; then
for devicetree in ${UBOOT_DEVICETREE}; do
install -Dm 0644 ${B}/${config}/arch/arm/dts/${devicetree}.dtb ${D}${datadir}/${devicetree}.dtb
done
else
bbwarn "${UBOOT_DEVICETREE} not found"
fi
}
do_install:append() {
# Copy additional files, so kernel can use it when creating the FIT image
if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then
install_helper_files
fi
}
COMPATIBLE_MACHINE = "(ccmp1)"

2
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb
View File

@ -32,4 +32,4 @@ do_install:append() {
fi
}
COMPATIBLE_MACHINE = "(ccmp2)"
COMPATIBLE_MACHINE = "(ccmp2|ccmp1)"

2
meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb
View File

@ -66,4 +66,4 @@ kernel_do_deploy:append:ccmp1() {
fi
}
COMPATIBLE_MACHINE = "(ccimx6$|ccmp1)"
COMPATIBLE_MACHINE = "(ccimx6$)"

12
meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
View File

@ -3,9 +3,9 @@
require recipes-kernel/linux/linux-dey.inc
SRCBRANCH = "v6.6.52/nxp/master"
SRCBRANCH:stm32mp2common = "v6.6.48/stm/master"
SRCBRANCH:stm32mpcommon = "v6.6.48/stm/master"
SRCREV = "${AUTOREV}"
SRCREV:stm32mp2common = "${AUTOREV}"
SRCREV:stm32mpcommon = "${AUTOREV}"
# Define RT patches per machine
RT_FILES:use-nxp-bsp = " \
@ -38,7 +38,7 @@ module_conf_btnxpuart:ccimx9 = "blacklist btnxpuart"
# ---------------------------------------------------------------------
# stub for devicetree which are located on digi directory
do_compile:append:ccmp2() {
do_compile:append:stm32mpcommon() {
if [ -d "${B}/arch/${ARCH}/boot/dts/digi" ]; then
for dtbf in ${KERNEL_DEVICETREE}; do
install -m 0644 "${B}/arch/${ARCH}/boot/dts/digi/${dtbf}" "${B}/arch/${ARCH}/boot/dts/"
@ -46,7 +46,7 @@ do_compile:append:ccmp2() {
fi
}
do_install:append:ccmp2() {
do_install:append:stm32mpcommon() {
if ${@bb.utils.contains('MACHINE_FEATURES','gpu','true','false',d)}; then
# when ACCEPT_EULA are filled
install -d ${D}/${sysconfdir}/modprobe.d/
@ -54,6 +54,6 @@ do_install:append:ccmp2() {
fi
}
FILES:${KERNEL_PACKAGE_NAME}-modules:ccmp2 += "${sysconfdir}/modprobe.d"
FILES:${KERNEL_PACKAGE_NAME}-modules:stm32mpcommon += "${sysconfdir}/modprobe.d"
COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccimx9|ccmp2)"
COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x|ccimx9|ccmp2|ccmp1)"