1 files changed, 7 insertions, 2 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 12c6c762b..d04651611 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
@@ -108,10 +108,14 @@ ubi_rw() {
   rw="${rwmtd#mtd}"
   ubidev="/dev/ubi${rw}"
 
-  # Create a ubi volume of size 4MB, that is the current size of the rwfs image
+  rwsize="$(fw_printenv -n rwfs_size)"
+  if [[ "${imgsize}" != "${rwsize}" ]]; then
+    fw_setenv rwfs_size "${imgsize}"
+  fi
+
   vol="$(findubi "${name}")"
   if [ -z "${vol}" ]; then
-    ubimkvol "${ubidev}" -N "${name}" -s 4MiB
+    ubimkvol "${ubidev}" -N "${name}" -s "${imgsize}"
   fi
 }
 
@@ -387,6 +391,7 @@ case "$1" in
   ubirw)
     reqmtd="$2"
     name="$3"
+    imgsize="$4"
     ubi_rw
     ;;
   ubiro)