diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2018-02-19 23:04:56 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-01 21:54:46 +0300 |
| commit | 313b51dab53bb663155dadd9448c2f9703269407 (patch) | |
| tree | a973be68214959980c3f664aba8121410c512556 /meta-phosphor/common | |
| parent | 740275a6cf6bdcc44680540c2c7020ff73f3152b (diff) | |
| download | openbmc-313b51dab53bb663155dadd9448c2f9703269407.tar.xz | |
obmc-flash-bmc: Remove checking for rwreset
With openbmc commit c03b9c4a5d5f8e089297d8d4c13540d6b2c9421f
a new U-Boot environment variable was added to perform a
factory reset, and logic was added to obmc-flash-bmc to
always check if this new variable existed so that systems
running older versions of BMC firmware would have this new
variable added since the environment variables are not updated
during a firmware update.
A few openbmc tags have been created since then, and only
witherspoon currently uses this code update script, so it's a
good time to remove this workaround.
Change-Id: I1cb7fdf0e657d24a7641cc4d18776ea20d206c7c
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc index 899d0f049..12c6c762b 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc @@ -67,14 +67,6 @@ findname() { echo "${n}" } -# Set the u-boot env command that performs the factory reset if requested -set_do_rwreset() { - if ! fw_printenv do_rwreset; then - fw_setenv do_rwreset "if test \"\${rwreset}\" = \"true\"; then ubi remove rwfs; ubi create rwfs 0x400000; fi" - fw_setenv obmc_bootcmd "ubi part obmc-ubi; run do_rwreset; ubi read \${loadaddr} \${kernelname}; bootm \${loadaddr}" - fi -} - # Make space on flash before creating new volumes. This can be enhanced # determine current flash usage. For now only keep a "keepmax" number of them ubi_remove_volumes() @@ -256,8 +248,6 @@ remount_ubi() { fi done done - - set_do_rwreset } # Read the current env variable and set it on the alternate boot env |