embeddedsw: Update to skip checks in eSDK build/install

device-tree, fsbl, plmfw, pmufw, psmfw do basic validation checks, when in
an eSDK skip these checks.  Otherwise a partially configured system can't
generate an eSDK for the end user.

Sync Core and Standalone usages to be consistent.

Also cleanup the BB_DONT_CACHE to be consistent in all usages.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

5 files changed, 13 insertions, 7 deletions

diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 9bc81c41..ddae03f5 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -62,13 +62,15 @@ devicetree_do_deploy:append() {
 }
 
 def check_devicetree_variables(d):
+    # Don't cache this, as the items on disk can change!
+    d.setVar('BB_DONT_CACHE', '1')
+
     if not d.getVar('CONFIG_DTFILE'):
-        d.setVar('BB_DONT_CACHE', '1')
         raise bb.parse.SkipRecipe("CONFIG_DTFILE or SYSTEM_DTFILE is not defined.")
     else:
         if not os.path.exists(d.getVar('CONFIG_DTFILE')):
-            d.setVar('BB_DONT_CACHE', '1')
-            raise bb.parse.SkipRecipe("The device tree %s is not available." % d.getVar('CONFIG_DTFILE'))
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("The device tree %s is not available." % d.getVar('CONFIG_DTFILE'))
         else:
             d.appendVar('SRC_URI', ' file://${CONFIG_DTFILE}')
             d.setVarFlag('do_install', 'file-checksums', '${CONFIG_DTFILE}:True')
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
index f8679f0e..68cfeb22 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
@@ -66,7 +66,8 @@ def check_fsbl_variables(d):
         d.setVar('BB_DONT_CACHE', '1')
 
         if not os.path.exists(d.getVar('FSBL_FILE') + ".elf"):
-            raise bb.parse.SkipRecipe("The expect file %s.elf is not available.\nSet FSBL_FILE to the path with a precompiled FSBL binary. See the meta-xilinx-core README for more information." % d.getVar('FSBL_FILE'))
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("The expect file %s.elf is not available.\nSet FSBL_FILE to the path with a precompiled FSBL binary. See the meta-xilinx-core README for more information." % d.getVar('FSBL_FILE'))
         else:
             # We found the file, so be sure to track it
             d.setVar('SRC_URI', 'file://${FSBL_FILE}.elf')
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
index 0306ef46..3ab694e6 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
@@ -75,7 +75,8 @@ def check_plm_vars(d):
             msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PLM_FILE')
             fail = True
         if fail:
-            raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
         else:
             # We found the file, so be sure to track it
             d.setVar('SRC_URI', 'file://${PLM_FILE}.elf file://${PLM_FILE}.bin')
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
index b3f9664e..80eade19 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
@@ -73,7 +73,8 @@ def check_pmu_vars(d):
             msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PMU_FILE')
             fail = True
         if fail:
-            raise bb.parse.SkipRecipe("%s  See the meta-xilinx-core README." % msg)
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("%s  See the meta-xilinx-core README." % msg)
         else:
             # We found the file, so be sure to track it
             d.setVar('SRC_URI', 'file://${PMU_FILE}.elf file://${PMU_FILE}.bin')
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
index 46124591..5a7695de 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
@@ -76,7 +76,8 @@ def check_psm_vars(d):
             fail = True
 
         if fail:
-            raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+            if not d.getVar('WITHIN_EXT_SDK'):
+                raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
         else:
             # We found the file, so be sure to track it
             d.setVar('SRC_URI', 'file://${PSM_FILE}.elf file://${PSM_FILE}.bin')