From 4d37569a522971df58a1a1d2f589a424a4d209d1 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 11 Apr 2025 11:53:20 +0200 Subject: [PATCH] ccmp1: move common ccmp15/ccmp13 defines to common include file Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 10 ---------- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 11 +---------- meta-digi-arm/conf/machine/include/ccmp1.inc | 12 ++++++++++++ 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 6476ce159..c514cc61d 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -51,8 +51,6 @@ STM32MP_KERNEL_DEVICETREE:ccmp13-dvk += " \ 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 @@ -114,14 +112,6 @@ ST_DEBUG_TRACE = "0" # 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 # ========================================================================= diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index bf04babd2..8f4b85e83 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -67,8 +67,6 @@ FIT_CONF_DEFAULT_DTB = "ccmp157-dvk.dtb" # ========================================================================= # Map OPTEE configuration to device tree list OPTEE_DEVICETREE_optee = "${STM32MP_DEVICETREE}" -# Set DTB load address to U-Boot fdt_addr_r -UBOOT_DTB_LOADADDRESS = "0xc4000000" # ========================================================================= # Machine features @@ -128,14 +126,6 @@ ST_DEBUG_TRACE = "0" # 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 # ========================================================================= @@ -174,6 +164,7 @@ MACHINE_DISTRO_FEATURES_REMOVE = "vulkan x11" # Disable use of vendorfs partition ST_VENDORFS = "0" +ST_USERFS = "0" # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = " \ diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index f17a6531d..1fadb7934 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -21,6 +21,9 @@ UBOOT_SUFFIX = "bin" FIP_UBOOT_DTB = "u-boot" # Include boot script into the FIT image UBOOT_ENV = "boot" +# For FIT image usage +UBOOT_DTB_LOADADDRESS = "0xc4000000" +UBOOT_DTBO_LOADADDRESS = "0xc4000000" # Set InitRAMDisk load address to U-boot initrd_addr UBOOT_RD_LOADADDRESS = "0xc4400000" # 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 # available space in the environment partition) UBOOT_ENV_RANGE ?= "" + 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" # Enable STM specific features