diff options
author | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
---|---|---|
committer | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
commit | 2af35ee50ce9918ee3626c59f2cff62cd3ab9568 (patch) | |
tree | bcc218f953c63222bff793a788b7922b9e39fb88 /meta-quanta/meta-gbs | |
parent | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (diff) | |
parent | 9248c75b142fa11243c20f4d200a04e4f6395b51 (diff) | |
download | openbmc-2af35ee50ce9918ee3626c59f2cff62cd3ab9568.tar.xz |
Merge tag '1-0.91' of github.com:intel-innersource/firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-quanta/meta-gbs')
-rw-r--r-- | meta-quanta/meta-gbs/conf/bblayers.conf.sample | 13 | ||||
-rw-r--r-- | meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh | 8 |
2 files changed, 4 insertions, 17 deletions
diff --git a/meta-quanta/meta-gbs/conf/bblayers.conf.sample b/meta-quanta/meta-gbs/conf/bblayers.conf.sample index 903833258..22757391f 100644 --- a/meta-quanta/meta-gbs/conf/bblayers.conf.sample +++ b/meta-quanta/meta-gbs/conf/bblayers.conf.sample @@ -18,16 +18,3 @@ BBLAYERS ?= " \ ##OEROOT##/meta-quanta \ ##OEROOT##/meta-quanta/meta-gbs \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-nuvoton \ - ##OEROOT##/meta-google \ - ##OEROOT##/meta-quanta \ - ##OEROOT##/meta-quanta/meta-gbs \ - " diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh index 36dfa452c..bf71e9452 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/files/bios-update.sh @@ -75,14 +75,14 @@ main() { fi echo "${KERNEL_FIU_ID}" > "${KERNEL_SYSFS_FIU}"/bind - # BIOS flash is labelled 'pnor' - pnor_mtd=$(findmtd pnor) - if [ -z "${pnor_mtd}" ]; then + # BIOS flash is labelled 'bios-primary' + bios_mtd=$(findmtd bios-primary) + if [ -z "${bios_mtd}" ]; then echo "Cannot find bios flash mtd partition!" exit 1 fi - flashcp -v $IMAGE_FILE /dev/"${pnor_mtd}" + flashcp -v $IMAGE_FILE /dev/"${bios_mtd}" if [ $? -eq 0 ]; then echo "bios update successfully..." else |