diff options
3 files changed, 14 insertions, 1 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config index fe09890c9..978e4d6e5 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-bsp/u-boot/files/fw_env.config @@ -12,7 +12,8 @@ # MTD SPI-dataflash example # MTD device name Device offset Env. size Flash sector size Number of sectors -/dev/mtd2 0x00000 0x20000 +#/dev/mtd2 0x00000 0x20000 +/run/fw_env 0x00000 0x20000 #/dev/mtd5 0x4200 0x4200 #/dev/mtd6 0x4200 0x4200 diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh index 431780a70..0dc4c35c6 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-init.sh @@ -29,6 +29,13 @@ findmtd() { echo $m } +env=$(findmtd u-boot-env) +if test -n $env +then + ln -s /dev/$env /run/mtd:u-boot-env + cp /run/mtd:u-boot-env /run/fw_env +fi + rofs=$(findmtd rofs) rwfs=$(findmtd rwfs) diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh index 029cd6556..cc076fdc0 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh @@ -24,6 +24,11 @@ do done set +x +if test -s /run/fw_env -a -c /run/mtd:u-boot-env -a ! -e /image-u-boot-env && + ! cmp /run/mtd:u-boot-env /run/fw_env +then + ln -s /run/fw_env /image-u-boot-env +fi if test -x /update && ls image-* > /dev/null 2>&1 then |
