From 6beda5bda3cc29e8ad12164deb5053d0f7a9feca Mon Sep 17 00:00:00 2001 From: Benjamin Fair Date: Mon, 21 Oct 2019 18:50:38 -0700 Subject: 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 (From meta-phosphor rev: 23e318f8ff17488e3611719e2941ab41d9fa3b02) Change-Id: I3c3bcc83c3925db0e1c6280d42d613495060ce55 Signed-off-by: Benjamin Fair Signed-off-by: Brad Bishop --- meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass') diff --git a/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass index 16112e638..d9d179ee6 100644 --- a/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass +++ b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass @@ -4,17 +4,19 @@ FULL_SUFFIX = "full" 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() { 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 -- cgit v1.2.3