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

ccmp1: move common ccmp15/ccmp13 defines to common include file 

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2025-04-11 11:53:20 +02:00
parent 7722e3a1d2
commit 4d37569a52
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,6 @@ STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += " \
ccmp133-dvk.dtb \ ccmp133-dvk.dtb \
" "
FIT_CONF_DEFAULT_DTB = "ccmp133-dvk.dtb" FIT_CONF_DEFAULT_DTB = "ccmp133-dvk.dtb"
# Set DTB load address to U-Boot fdt_addr_r
UBOOT_DTB_LOADADDRESS = "0xc4000000"
# ========================================================================= # =========================================================================
# optee # optee
@ -114,14 +112,6 @@ ST_DEBUG_TRACE = "0"
# Flashlayouts # Flashlayouts
# ========================================================================= # =========================================================================
# =========================================================================
# Kernel
# =========================================================================
KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_SIGN_FIT_STM', '1', 'fitImage', 'zImage', d)}"
KERNEL_CLASSES = "kernel-fitimage"
KERNEL_ALT_IMAGETYPE = "Image vmlinux"
KERNEL_DEFCONFIG ?= "arch/arm/configs/ccmp1_defconfig"
# ========================================================================= # =========================================================================
# DEY settings # DEY settings
# ========================================================================= # =========================================================================

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

@ -67,8 +67,6 @@ FIT_CONF_DEFAULT_DTB = "ccmp157-dvk.dtb"
# ========================================================================= # =========================================================================
# Map OPTEE configuration to device tree list # Map OPTEE configuration to device tree list
OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}"
# Set DTB load address to U-Boot fdt_addr_r
UBOOT_DTB_LOADADDRESS = "0xc4000000"
# ========================================================================= # =========================================================================
# Machine features # Machine features
@ -128,14 +126,6 @@ ST_DEBUG_TRACE = "0"
# Flashlayouts # Flashlayouts
# ========================================================================= # =========================================================================
# =========================================================================
# Kernel
# =========================================================================
KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_SIGN_FIT_STM', '1', 'fitImage', 'zImage', d)}"
KERNEL_CLASSES = "kernel-fitimage"
KERNEL_ALT_IMAGETYPE = "Image vmlinux"
KERNEL_DEFCONFIG ?= "arch/arm/configs/ccmp1_defconfig"
# ========================================================================= # =========================================================================
# DEY settings # DEY settings
# ========================================================================= # =========================================================================
@ -174,6 +164,7 @@ MACHINE_DISTRO_FEATURES_REMOVE = "vulkan x11"
# Disable use of vendorfs partition # Disable use of vendorfs partition
ST_VENDORFS = "0" ST_VENDORFS = "0"
ST_USERFS = "0"
# Boot artifacts to be copied from the deploy dir to the installer ZIP # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \

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

@ -21,6 +21,9 @@ UBOOT_SUFFIX = "bin"
FIP_UBOOT_DTB = "u-boot" FIP_UBOOT_DTB = "u-boot"
# Include boot script into the FIT image # Include boot script into the FIT image
UBOOT_ENV = "boot" UBOOT_ENV = "boot"
# For FIT image usage
UBOOT_DTB_LOADADDRESS = "0xc4000000"
UBOOT_DTBO_LOADADDRESS = "0xc4000000"
# Set InitRAMDisk load address to U-boot initrd_addr # Set InitRAMDisk load address to U-boot initrd_addr
UBOOT_RD_LOADADDRESS = "0xc4400000" UBOOT_RD_LOADADDRESS = "0xc4400000"
# U-Boot environment offset (within partition) # U-Boot environment offset (within partition)
@ -32,8 +35,17 @@ UBOOT_ENV_SIZE ?= "0x20000"
# the U-Boot environment can take up (if undefined, it will take up all the # the U-Boot environment can take up (if undefined, it will take up all the
# available space in the environment partition) # available space in the environment partition)
UBOOT_ENV_RANGE ?= "" UBOOT_ENV_RANGE ?= ""
FIP_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_Signed', '', d)}" FIP_SIGN_SUFFIX ?= "${@bb.utils.contains('TRUSTFENCE_SIGN', '1', '_Signed', '', d)}"
# =========================================================================
# Kernel
# =========================================================================
KERNEL_IMAGETYPE = "${@bb.utils.contains('TRUSTFENCE_SIGN_FIT_STM', '1', 'fitImage', 'zImage', d)}"
KERNEL_CLASSES = "kernel-fitimage"
KERNEL_ALT_IMAGETYPE = "Image vmlinux"
KERNEL_DEFCONFIG ?= "arch/arm/configs/ccmp1_defconfig"
STORAGE_MEDIA = "mtd" STORAGE_MEDIA = "mtd"
# Enable STM specific features # Enable STM specific features