From 56219a7e59175983f4c8f185e3c150b60b214f18 Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Fri, 1 Dec 2023 12:11:36 +0100
Subject: [PATCH] conf: machine: remove BOOTLOADER_SEEK_OFFSET

This commit removes the BOOTLOADER_SEEK_OFFSER, because it has been
moved into the swupdate class and renamed into SWUPDATE_UBOOT_OFFSET.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 meta-digi-arm/conf/machine/ccimx6qpsbc.conf    | 2 --
 meta-digi-arm/conf/machine/ccimx6sbc.conf      | 2 --
 meta-digi-arm/conf/machine/ccimx8mm-dvk.conf   | 1 -
 meta-digi-arm/conf/machine/ccimx8mn-dvk.conf   | 1 -
 meta-digi-arm/conf/machine/ccimx93-dvk.conf    | 1 -
 meta-digi-arm/conf/machine/include/ccimx8x.inc | 2 --
 meta-digi-arm/conf/machine/include/ccmp1.inc   | 3 ---
 7 files changed, 12 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
index 54cdcbd6e..d60abb183 100644
--- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf
@@ -26,8 +26,6 @@ UBOOT_CONFIG ??= "ccimx6qpsbc1GB ccimx6qpsbc2GB"
 UBOOT_CONFIG[ccimx6qpsbc1GB] = "ccimx6qpsbc1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_CONFIG[ccimx6qpsbc2GB] = "ccimx6qpsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
-BOOTLOADER_SEEK_BOOT = "1"
-
 KERNEL_DEVICETREE ?= " \
     imx6qp-ccimx6qpsbc.dtb \
     imx6qp-ccimx6qpsbc-id160.dtb \
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index e116cf8b2..047e49770 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -24,8 +24,6 @@ UBOOT_CONFIG[ccimx6qsbc2GB] = "ccimx6qsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFI
 UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}"
 
-BOOTLOADER_SEEK_BOOT = "1"
-
 KERNEL_DEVICETREE ?= " \
     imx6dl-ccimx6sbc.dtb \
     imx6dl-ccimx6sbc-w.dtb \
diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index b10dd1dd5..2e768c95f 100644
--- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
@@ -9,7 +9,6 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:${DIGI_FAMILY}:${DIGI_SOM}:"
 include conf/machine/include/ccimx8m.inc
 
 BOOTLOADER_SEEK_USERDATA = "33"
-BOOTLOADER_SEEK_BOOT = "0"
 
 # U-Boot configurations
 #
diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index d845609f0..8cadc00e3 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -9,7 +9,6 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:${DIGI_FAMILY}:${DIGI_SOM}:"
 include conf/machine/include/ccimx8m.inc
 
 BOOTLOADER_SEEK_USERDATA = "32"
-BOOTLOADER_SEEK_BOOT = "0"
 
 # U-Boot configurations
 #
diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
index 858dc075e..018e08afb 100644
--- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
@@ -13,7 +13,6 @@ UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig"
 UBOOT_DTB_NAME = "ccimx93-dvk.dtb"
 
 BOOTLOADER_SEEK_USERDATA = "32"
-BOOTLOADER_SEEK_BOOT = "0"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx93-dvk.dtb \
diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc
index 000cc3834..36f9c1bfb 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8x.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc
@@ -18,8 +18,6 @@ EXTRA_IMAGEDEPENDS += "imx-boot"
 BOOTLOADER_IMAGE_RECIPE = "imx-boot"
 # BOOTLOADER_SEEK_USERDATA is 33 for step A of the silicon and 32 for step B
 BOOTLOADER_SEEK_USERDATA = "32"
-# BOOTLOADER_SEEK_BOOT is 32 for step B of silicon and 0 for step C
-BOOTLOADER_SEEK_BOOT ?= "0"
 BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin"
 SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
 
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 484b798df..0189ba36b 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -80,6 +80,3 @@ UBOOT_ENV = "${@bb.utils.contains('TRUSTFENCE_FIT_IMG', '1', 'boot', '', d)}"
 # Partitions to blacklist for swupdate:
 # fsbl1, fsbl2, metadata1, metadata2, fip-a, fip-b
 SWUPDATE_MTD_BLACKLIST = "0 1 2 3 4 5"
-
-# Bootloader Flash offset
-BOOTLOADER_SEEK_BOOT = "0"