diff options
| author | William A. Kennington III <wak@google.com> | 2019-09-17 04:29:53 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-25 03:03:03 +0300 |
| commit | 7a6b143d9b30f8f4a24cf7cd17b2cb1df39002a2 (patch) | |
| tree | 6468ae94f3c1f8c377f16a33c82564077cd16598 /meta-phosphor | |
| parent | 727155e89fd50393b6444d182ac8fab4309e6b2a (diff) | |
| download | openbmc-7a6b143d9b30f8f4a24cf7cd17b2cb1df39002a2.tar.xz | |
nuvoton: Apply image overrides to all image types
Right now, nuvoton overrides needed for generating and applying the
bootblock are not applied to images other than obmc-phosphor-image. This
means that core-image-minimal is unbootable on nuvoton platforms.
This change makes the nuvoton overrides apply globally to all images.
(From meta-phosphor rev: 9819cb9533f430797d47dadff558cf4462670976)
Change-Id: If4bef5f8106278fa6ebeb2198bc43fdd2b70a641
Signed-off-by: William A. Kennington III <wak@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor')
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass (renamed from meta-phosphor/nuvoton-layer/recipes-phosphor/images/obmc-phosphor-image.bbappend) | 44 | ||||
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 1 |
2 files changed, 11 insertions, 34 deletions
diff --git a/meta-phosphor/nuvoton-layer/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass index e60401e890..16112e6386 100644 --- a/meta-phosphor/nuvoton-layer/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-phosphor/classes/image_types_phosphor_nuvoton.bbclass @@ -1,33 +1,13 @@ -EXTRA_DEPENDS = "" - -EXTRA_DEPENDS_npcm7xx = " \ - npcm7xx-bootblock:do_deploy \ - npcm7xx-bingo-native:do_populate_sysroot \ - " - UBOOT_BINARY := "u-boot.${UBOOT_SUFFIX}" - BOOTBLOCK = "Poleg_bootblock.bin" - - FULL_SUFFIX = "full" MERGED_SUFFIX = "merged" - -UBOOT_SUFFIX_append_npcm7xx = ".${MERGED_SUFFIX}" - - -do_prepare_bootloaders() { - -} - +UBOOT_SUFFIX_append = ".${MERGED_SUFFIX}" # Prepare the Bootblock and U-Boot images using npcm7xx-bingo - -do_prepare_bootloaders_npcm7xx() { - - currdir=`pwd` +do_prepare_bootloaders() { + local olddir="$(pwd)" cd ${DEPLOY_DIR_IMAGE} - bingo ${STAGING_DIR_NATIVE}/${bindir}/BootBlockAndHeader_EB.xml \ -o ${DEPLOY_DIR_IMAGE}/${BOOTBLOCK}.${FULL_SUFFIX} @@ -36,29 +16,25 @@ do_prepare_bootloaders_npcm7xx() { bingo ${STAGING_DIR_NATIVE}/${bindir}/mergedBootBlockAndUboot.xml \ -o ${DEPLOY_DIR_IMAGE}/${UBOOT_BINARY}.${MERGED_SUFFIX} - - cd $currdir + cd "$olddir" } - -do_prepare_bootloaders[depends] += "${EXTRA_DEPENDS}" - +do_prepare_bootloaders[depends] += " \ + npcm7xx-bootblock:do_deploy \ + npcm7xx-bingo-native:do_populate_sysroot \ + " addtask do_prepare_bootloaders before do_generate_static after do_generate_rwfs_static - # Include the full bootblock and u-boot in the final static image - -python do_generate_static_append_npcm7xx() { - +python do_generate_static_append() { _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), 'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)), int(d.getVar('FLASH_UBOOT_OFFSET', True)), int(d.getVar('FLASH_KERNEL_OFFSET', True))) } -do_make_ubi_append_npcm7xx() { - +do_make_ubi_append() { # Concatenate the uboot and ubi partitions dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ if=${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} \ diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index dc6d4ae484..2a9301d76a 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -134,6 +134,7 @@ KERNEL_FEATURES_append = " phosphor-gpio-keys" KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys" IMAGE_CLASSES_append = " image_types_phosphor" +IMAGE_CLASSES_append_npcm7xx = " image_types_phosphor_nuvoton" IMAGE_INSTALL_append = " dbus-broker" |