commit 23e318f8ff17488e3611719e2941ab41d9fa3b02
author Benjamin Fair <benjaminfair@google.com> Mon Oct 21 18:50:38 2019 -0700
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Sat Nov 16 12:23:45 2019 +0000
tree 27a526404efc2e3e679b238aad6a8723c8654b44
parent 3dabe698cf24b4ff1e317ab5a041db2909005b53

meta-phosphor: image_types_phosphor_nuvoton: handle new IGPS recipe

The XML files used by Bingo have been split into a separate recipe
called "npcm7xx-igps" which must be added as a dependency.

The location of the files has also changed.

Tested: Built for MACHINE=gsj

Change-Id: I148e6370480ac00d41b6bbd4e479ccf1e4def27d
Signed-off-by: Benjamin Fair <benjaminfair@google.com>

classes/image_types_phosphor_nuvoton.bbclass

diff --git a/classes/image_types_phosphor_nuvoton.bbclass b/classes/image_types_phosphor_nuvoton.bbclass
index 16112e6..d9d179e 100644
--- a/classes/image_types_phosphor_nuvoton.bbclass
+++ b/classes/image_types_phosphor_nuvoton.bbclass
@@ -4,17 +4,19 @@
 MERGED_SUFFIX = "merged"
 UBOOT_SUFFIX_append = ".${MERGED_SUFFIX}"
 
+IGPS_DIR = "${STAGING_DIR_NATIVE}/${datadir}/npcm7xx-igps"
+
 # Prepare the Bootblock and U-Boot images using npcm7xx-bingo
 do_prepare_bootloaders() {
     local olddir="$(pwd)"
     cd ${DEPLOY_DIR_IMAGE}
-    bingo ${STAGING_DIR_NATIVE}/${bindir}/BootBlockAndHeader_EB.xml \
+    bingo ${IGPS_DIR}/BootBlockAndHeader_${IGPS_MACHINE}.xml \
             -o ${DEPLOY_DIR_IMAGE}/${BOOTBLOCK}.${FULL_SUFFIX}
 
-    bingo ${STAGING_DIR_NATIVE}/${bindir}/UbootHeader_EB.xml \
+    bingo ${IGPS_DIR}/UbootHeader_${IGPS_MACHINE}.xml \
             -o ${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY}.${FULL_SUFFIX}
 
-    bingo ${STAGING_DIR_NATIVE}/${bindir}/mergedBootBlockAndUboot.xml \
+    bingo ${IGPS_DIR}/mergedBootBlockAndUboot.xml \
             -o ${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY}.${MERGED_SUFFIX}
     cd "$olddir"
 }
@@ -22,6 +24,7 @@
 do_prepare_bootloaders[depends] += " \
     npcm7xx-bootblock:do_deploy \
     npcm7xx-bingo-native:do_populate_sysroot \
+    npcm7xx-igps-native:do_populate_sysroot \
     "
 
 addtask do_prepare_bootloaders before do_generate_static after do_generate_rwfs_static