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

ccmp1: remove dependencies from kernel include file from meta-st-stm32mp 

An anonymous function in linux-stm32mp.inc produces a bbfatal error when
KERNEL_DEVICETREE variable contains more than one device tree. This is our
case since we build the main DT plus a number of DT overlays.
This commit removes the dependency to this include file since we have our
own recipe to build the kernel and it is not needed at all.
It also removes the build of a uImage and the need to provide a
LOADADDR.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2023-11-10 13:19:23 +01:00
parent c497caca66
commit d3f3cfdb62
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-digi-arm/conf/layer.conf
View File

@ -45,6 +45,7 @@ BBMASK += " \
meta-st-stm32mp/recipes-core/base-files/base-files_%.bbappend \ meta-st-stm32mp/recipes-core/base-files/base-files_%.bbappend \
meta-st-stm32mp/recipes-core/busybox/busybox_%.bbappend \ meta-st-stm32mp/recipes-core/busybox/busybox_%.bbappend \
meta-st-stm32mp/recipes-core/systemd/systemd-conf_%.bbappend \ meta-st-stm32mp/recipes-core/systemd/systemd-conf_%.bbappend \
meta-st-stm32mp/recipes-kernel/linux/linux-stm32mp_5.15.bb \
" "
# Tweak stm32mpu-ai dependencies to use ST's machine learning packages # Tweak stm32mpu-ai dependencies to use ST's machine learning packages

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

@ -111,10 +111,9 @@ OPTEE_CONF = "ccmp13-dvk"
# ========================================================================= # =========================================================================
KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'fitImage', 'zImage', d)}" KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'fitImage', 'zImage', d)}"
KERNEL_CLASSES = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'kernel-fitimage', 'kernel-uimage', d)}" KERNEL_CLASSES = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'kernel-fitimage', 'kernel-uimage', d)}"
KERNEL_ALT_IMAGETYPE = "Image uImage vmlinux" KERNEL_ALT_IMAGETYPE = "Image vmlinux"
KERNEL_DEFCONFIG ?= "ccmp1_defconfig" KERNEL_DEFCONFIG ?= "ccmp1_defconfig"
KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig" KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig"
ST_KERNEL_LOADADDR ?= "0xC0008000"
# ========================================================================= # =========================================================================
# DEY settings # DEY settings

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

@ -119,10 +119,9 @@ OPTEE_CONF = "ccmp15-dvk"
# ========================================================================= # =========================================================================
KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'fitImage', 'zImage', d)}" KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'fitImage', 'zImage', d)}"
KERNEL_CLASSES = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'kernel-fitimage', 'kernel-uimage', d)}" KERNEL_CLASSES = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'kernel-fitimage', 'kernel-uimage', d)}"
KERNEL_ALT_IMAGETYPE = "Image uImage vmlinux" KERNEL_ALT_IMAGETYPE = "Image vmlinux"
KERNEL_DEFCONFIG ?= "ccmp1_defconfig" KERNEL_DEFCONFIG ?= "ccmp1_defconfig"
KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig" KERNEL_EXTERNAL_DEFCONFIG ?= "defconfig"
ST_KERNEL_LOADADDR ?= "0xC0008000"
# ========================================================================= # =========================================================================
# DEY settings # DEY settings

1
meta-digi-arm/conf/machine/include/ccmp1.inc
View File

@ -41,6 +41,7 @@ UBOOT_ENV_RANGE ?= ""
MACHINE_EXTRA_RDEPENDS += " \ MACHINE_EXTRA_RDEPENDS += " \
mtd-utils-ubifs \ mtd-utils-ubifs \
" "
MACHINE_EXTRA_RRECOMMENDS:remove = "kernel-imagebootfs"
# Image FS types # Image FS types
IMAGE_FSTYPES:remove = "ext4 tar.xz" IMAGE_FSTYPES:remove = "ext4 tar.xz"

3
meta-digi-arm/recipes-kernel/linux/linux-dey.inc
View File

@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit kernel inherit kernel
inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversion', '', d)} inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversion', '', d)}
require ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)} require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)}
require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/linux-trustfence.inc', '', d)} require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/linux-trustfence.inc', '', d)}
@ -30,8 +29,6 @@ OVERLAYS_DTC_FLAGS:ccimx6ul = ""
OVERLAYS_DTC_FLAGS:ccimx6 = "" OVERLAYS_DTC_FLAGS:ccimx6 = ""
KERNEL_DTC_FLAGS = "${OVERLAYS_DTC_FLAGS}" KERNEL_DTC_FLAGS = "${OVERLAYS_DTC_FLAGS}"
KERNEL_EXTRA_ARGS:stm32mpcommon += "LOADADDR=${ST_KERNEL_LOADADDR}"
# A user can provide his own kernel 'defconfig' file by: # A user can provide his own kernel 'defconfig' file by:
# - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file
# inside the kernel repository. # inside the kernel repository.