u-boot-xlnx-scr: Adjusted to use an intermediate default

Adjusted to use an intermediate default for KERNEL, DEVICETREE and
RAMDISK image offsets, so no override is required.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 30 insertions, 21 deletions

diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
index e13413a1..24fd76c0 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
@@ -73,17 +73,21 @@ UBOOTPXE_CONFIG_NAME = "${UBOOTPXE_CONFIG}${IMAGE_VERSION_SUFFIX}"
 DEVICETREE_ADDRESS ?= "${@append_baseaddr(d,d.getVar('DEVICETREE_OFFSET'))}"
 DEVICETREE_ADDRESS_SD ?= "${DEVICETREE_ADDRESS}"
 
-DEVICETREE_OFFSET:microblaze ??= "0x1e00000"
-DEVICETREE_OFFSET:zynqmp ??= "0x100000"
-DEVICETREE_OFFSET:zynq ??= "0x100000"
-DEVICETREE_OFFSET:versal ??= "0x1000"
-DEVICETREE_OFFSET:versal-net ??= "0x1000"
-
-DEVICETREE_OVERLAY_OFFSET:microblaze ??= "0x1e00000"
-DEVICETREE_OVERLAY_OFFSET:zynqmp ??= "0x100000"
-DEVICETREE_OVERLAY_OFFSET:zynq ??= "0x100000"
-DEVICETREE_OVERLAY_OFFSET:versal ??= "0x1000"
-DEVICETREE_OVERLAY_OFFSET:versal-net ??= "0x1000"
+DEVICETREE_OFFSET_DEFAULT ??= ""
+DEVICETREE_OFFSET_DEFAULT:microblaze ??= "0x1e00000"
+DEVICETREE_OFFSET_DEFAULT:zynqmp ??= "0x100000"
+DEVICETREE_OFFSET_DEFAULT:zynq ??= "0x100000"
+DEVICETREE_OFFSET_DEFAULT:versal ??= "0x1000"
+DEVICETREE_OFFSET_DEFAULT:versal-net ??= "0x1000"
+DEVICETREE_OFFSET ??= "${DEVICETREE_OFFSET_DEFAULT}"
+
+DEVICETREE_OVERLAY_OFFSET_DEFAULT ??= ""
+DEVICETREE_OVERLAY_OFFSET_DEFAULT:microblaze ??= "0x1e00000"
+DEVICETREE_OVERLAY_OFFSET_DEFAULT:zynqmp ??= "0x100000"
+DEVICETREE_OVERLAY_OFFSET_DEFAULT:zynq ??= "0x100000"
+DEVICETREE_OVERLAY_OFFSET_DEFAULT:versal ??= "0x1000"
+DEVICETREE_OVERLAY_OFFSET_DEFAULT:versal-net ??= "0x1000"
+DEVICETREE_OVERLAY_OFFSET ??= "${DEVICETREE_OVERLAY_OFFSET_DEFAULT}"
 DEVICETREE_OVERLAY_PADSIZE ??= "0x1f00000"
 
 DEVICETREE_OVERLAY_ADDRESS ?= "${@hex(int(append_baseaddr(d,d.getVar('DEVICETREE_OVERLAY_OFFSET')),16) \
@@ -91,21 +95,26 @@ DEVICETREE_OVERLAY_ADDRESS ?= "${@hex(int(append_baseaddr(d,d.getVar('DEVICETREE
 
 KERNEL_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('KERNEL_OFFSET'))}"
 
-KERNEL_OFFSET:microblaze ??= "0x0"
-KERNEL_OFFSET:zynqmp ??= "0x200000"
-KERNEL_OFFSET:zynq ??= "0x200000"
-KERNEL_OFFSET:versal ??= "0x200000"
-KERNEL_OFFSET:versal-net ??= "0x200000"
+
+KERNEL_OFFSET_DEFAULT ??= ""
+KERNEL_OFFSET_DEFAULT:microblaze ??= "0x0"
+KERNEL_OFFSET_DEFAULT:zynqmp ??= "0x200000"
+KERNEL_OFFSET_DEFAULT:zynq ??= "0x200000"
+KERNEL_OFFSET_DEFAULT:versal ??= "0x200000"
+KERNEL_OFFSET_DEFAULT:versal-net ??= "0x200000"
+KERNEL_OFFSET ??= "${KERNEL_OFFSET_DEFAULT}"
 
 KERNEL_IMAGE ?= "${KERNEL_IMAGETYPE}"
 
 RAMDISK_IMAGE_ADDRESS ?= "${@append_baseaddr(d,d.getVar('RAMDISK_OFFSET'))}"
 
-RAMDISK_OFFSET:microblaze ??= "0x2e00000"
-RAMDISK_OFFSET:zynq ??= "0x4000000"
-RAMDISK_OFFSET:zynqmp ??= "0x4000000"
-RAMDISK_OFFSET:versal ??= "0x4000000"
-RAMDISK_OFFSET:versal-net ??= "0x4000000"
+RAMDISK_OFFSET_DEFAULT ??= ""
+RAMDISK_OFFSET_DEFAULT:microblaze ??= "0x2e00000"
+RAMDISK_OFFSET_DEFAULT:zynq ??= "0x4000000"
+RAMDISK_OFFSET_DEFAULT:zynqmp ??= "0x4000000"
+RAMDISK_OFFSET_DEFAULT:versal ??= "0x4000000"
+RAMDISK_OFFSET_DEFAULT:versal-net ??= "0x4000000"
+RAMDISK_OFFSET ??= "${RAMDISK_OFFSET_DEFAULT}"
 
 FIT_IMAGE_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('FIT_IMAGE_OFFSET'))}"
 FIT_IMAGE_OFFSET ??= "0x10000000"