From a0bc831353b4e60aeaa0a5716c1ebfa464d58deb Mon Sep 17 00:00:00 2001 From: David Escalona Date: Thu, 21 Dec 2023 14:27:27 +0100 Subject: [PATCH] meta-digi-arm: machine: add new 'BOOTLOADER_SEEK_BOOTPART' variable to platform configurations This new variable establishes the number of 1Kb blocks to skip before writing U-Boot in the bootloader partition. Signed-off-by: David Escalona --- meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 1 + meta-digi-arm/conf/machine/include/ccimx6.inc | 2 ++ meta-digi-arm/conf/machine/include/digi-defaults.inc | 3 +++ meta-digi-dey/classes/dey-swupdate-common.bbclass | 3 +-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index 2e768c95f..33d6cbff0 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -9,6 +9,7 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:${DIGI_FAMILY}:${DIGI_SOM}:" include conf/machine/include/ccimx8m.inc BOOTLOADER_SEEK_USERDATA = "33" +BOOTLOADER_SEEK_BOOTPART = "33" # U-Boot configurations # diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index f90064980..4f5161631 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -8,6 +8,8 @@ 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 +BOOTLOADER_SEEK_BOOTPART = "1" + # Platform u-boot settings UBOOT_PREFIX = "u-boot" UBOOT_SUFFIX = "imx" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 05cc96252..72d2068a9 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -92,3 +92,6 @@ SWUPDATE_UBOOTIMG ?= "false" # ConnectCore Cloud Services packages to install CCCS_PKGS ?= "cccs-gs-demo dey-examples-cccs" + +# Default 1k-bloks seek in boot partition. +BOOTLOADER_SEEK_BOOTPART ?= "0" diff --git a/meta-digi-dey/classes/dey-swupdate-common.bbclass b/meta-digi-dey/classes/dey-swupdate-common.bbclass index 856948dd3..8b3178bd1 100644 --- a/meta-digi-dey/classes/dey-swupdate-common.bbclass +++ b/meta-digi-dey/classes/dey-swupdate-common.bbclass @@ -102,8 +102,7 @@ SWUPDATE_UBOOT_NAME:ccmp1 ?= "${SWUPDATE_UBOOT_PREFIX}-${MACHINE}-optee${FIP_SIG SWUPDATE_UBOOT_NAME_TFA ?= "" SWUPDATE_UBOOT_NAME_TFA:ccmp1 ?= "${SWUPDATE_UBOOT_PREFIX_TFA}-${MACHINE}-nand${SWUPDATE_UBOOT_EXT_TFA}${TFA_SIGN_SUFFIX}" -SWUPDATE_UBOOT_OFFSET ?= "0" -SWUPDATE_UBOOT_OFFSET:ccimx6 ?= "1" +SWUPDATE_UBOOT_OFFSET ?= "${BOOTLOADER_SEEK_BOOTPART}" # Retrieve the correct encryption type. def get_swupdate_uboot_enc(d):