1 files changed, 15 insertions, 14 deletions

diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
index 1efc5392..dafaab25 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
@@ -16,7 +16,7 @@ def remove_task_from_depends(d):
     extra_imagedepends = d.getVar('EXTRA_IMAGEDEPENDS') or ''
     uenv_depends = ''
     for imagedepend in extra_imagedepends.split():
-        if imagedepend == d.getVar("BPN"):
+        if imagedepend == d.getVar("BPN") or '':
             continue
         elif ':' in imagedepend:
             uenv_depends += ' %s' % imagedepend.split(':')[0]
@@ -25,16 +25,16 @@ def remove_task_from_depends(d):
     return uenv_depends
 
 def uboot_boot_cmd(d):
-    if d.getVar("KERNEL_IMAGETYPE") in ["uImage", "fitImage"]:
+    if (d.getVar("KERNEL_IMAGETYPE") or '') in ["uImage", "fitImage"]:
         return "bootm"
-    if d.getVar("KERNEL_IMAGETYPE") in ["zImage"]:
+    if (d.getVar("KERNEL_IMAGETYPE") or '') in ["zImage"]:
         return "bootz"
-    if d.getVar("KERNEL_IMAGETYPE") in ["Image"]:
+    if (d.getVar("KERNEL_IMAGETYPE") or '') in ["Image"]:
         return "booti"
     raise bb.parse.SkipRecipe("Unsupport kernel image type")
 
 def get_sdbootdev(d):
-    if d.getVar("SOC_FAMILY") in ["zynqmp"]:
+    if (d.getVar("SOC_FAMILY") or '') in ["zynqmp"]:
         return "${devnum}"
     else:
         return "0"
@@ -43,24 +43,24 @@ def uenv_populate(d):
     # populate the environment values
     env = {}
 
-    env["machine_name"] = d.getVar("MACHINE")
+    env["machine_name"] = d.getVar("MACHINE") or ''
 
-    env["kernel_image"] = d.getVar("KERNEL_IMAGETYPE")
-    env["kernel_load_address"] = d.getVar("KERNEL_LOAD_ADDRESS")
+    env["kernel_image"] = d.getVar("KERNEL_IMAGETYPE") or ''
+    env["kernel_load_address"] = d.getVar("KERNEL_LOAD_ADDRESS") or ''
 
     env["devicetree_image"] = boot_files_dtb_filepath(d)
-    env["devicetree_load_address"] = d.getVar("DEVICETREE_LOAD_ADDRESS")
-    env["devicetree_overlay_load_address" ] = d.getVar("DEVICETREE_OVERLAY_LOAD_ADDRESS")
+    env["devicetree_load_address"] = d.getVar("DEVICETREE_LOAD_ADDRESS") or ''
+    env["devicetree_overlay_load_address" ] = d.getVar("DEVICETREE_OVERLAY_LOAD_ADDRESS") or ''
 
-    env["bootargs"] = d.getVar("KERNEL_BOOTARGS")
+    env["bootargs"] = d.getVar("KERNEL_BOOTARGS") or ''
 
     env["loadkernel"] = "fatload mmc " + get_sdbootdev(d) + " ${kernel_load_address} ${kernel_image}"
     env["loaddtb"] = "fatload mmc  " + get_sdbootdev(d) + " ${devicetree_load_address} ${devicetree_image}"
     env["loaddtbo"] = "if test -e mmc " + get_sdbootdev(d) + " /devicetree/openamp.dtbo; then fatload mmc " + get_sdbootdev(d) + " ${devicetree_overlay_load_address} /devicetree/openamp.dtbo ; fdt addr ${devicetree_load_address} ; fdt resize 8192 ; fdt apply ${devicetree_overlay_load_address} ; fi"
     env["bootkernel"] = "run loadkernel && run loaddtb && run loaddtbo && " + uboot_boot_cmd(d) + " ${kernel_load_address} - ${devicetree_load_address}"
 
-    if d.getVar("SOC_FAMILY") in ["zynqmp"]:
-        env["bootkernel"] = "setenv bootargs " +  d.getVar("KERNEL_BOOTARGS") + " ; " + env["bootkernel"]
+    if (d.getVar("SOC_FAMILY") or '') in ["zynqmp"]:
+        env["bootkernel"] = "setenv bootargs " +  (d.getVar("KERNEL_BOOTARGS") or '') + " ; " + env["bootkernel"]
 
     # default uenvcmd does not load bitstream
     env["uenvcmd"] = "run bootkernel"
@@ -89,7 +89,8 @@ KERNEL_LOAD_ADDRESS:zynq = "0x2080000"
 KERNEL_LOAD_ADDRESS:zynqmp = "0x200000"
 DEVICETREE_LOAD_ADDRESS:zynq = "0x2000000"
 DEVICETREE_LOAD_ADDRESS:zynqmp = "0x4000000"
-DEVICETREE_OVERLAY_LOAD_ADDRESS = "${@hex(int(d.getVar("DEVICETREE_LOAD_ADDRESS"),16) + 0xf00000)}"
+DEVICETREE_OVERLAY_LOAD_ADDRESS:zynq = "${@hex(int(d.getVar("DEVICETREE_LOAD_ADDRESS"),16) + 0xf00000)}"
+DEVICETREE_OVERLAY_LOAD_ADDRESS:zynqmp = "${@hex(int(d.getVar("DEVICETREE_LOAD_ADDRESS"),16) + 0xf00000)}"
 
 python do_compile() {
     env = uenv_populate(d)