diff options
6 files changed, 14 insertions, 6 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend index 336697bcf..feab2c1b0 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager.bbappend @@ -1,3 +1,4 @@ BMC_RW_MTD = "bmc" BMC_RO_MTD = "alt-bmc+bmc" BMC_KERNEL_MTD = "bmc" +BMC_RW_SIZE = "0x600000" diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 5599332f6..35843ea81 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -52,8 +52,8 @@ FLASH_ROFS_OFFSET ?= "4864" FLASH_RWFS_OFFSET ?= "28672" # UBI volume sizes in KB unless otherwise noted. -FLASH_UBI_RWFS_SIZE ?= "4096" -FLASH_UBI_RWFS_TXT_SIZE ?= "4MiB" +FLASH_UBI_RWFS_SIZE ?= "6144" +FLASH_UBI_RWFS_TXT_SIZE ?= "6MiB" python() { # Compute rwfs LEB count and LEB size. diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch index 792cdb7c5..6bf9bb798 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch +++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-Add-conditional-factory-reset-comm.patch @@ -21,7 +21,7 @@ index 14191e4ab0..aaa5155e00 100644 #define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CONFIG_ENV_SIZE_REDUND 0x10000 -+#define CONFIG_RWFS_SIZE 0x400000 ++#define CONFIG_RWFS_SIZE 0x600000 + #define CONFIG_BOOTCOMMAND "run set_bootargs; run obmc_bootcmd" #define CONFIG_ENV_OVERWRITE diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb index 5cd017e18..725c83577 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb @@ -86,9 +86,11 @@ SYSTEMD_SERVICE_${PN}-updater += " \ BMC_RW_MTD ??= "bmc" BMC_RO_MTD ??= "bmc" BMC_KERNEL_MTD ??= "bmc" +BMC_RW_SIZE ??= "0x600000" SYSTEMD_SUBSTITUTIONS += "RW_MTD:${BMC_RW_MTD}:obmc-flash-bmc-ubirw.service" SYSTEMD_SUBSTITUTIONS += "RO_MTD:${BMC_RO_MTD}:obmc-flash-bmc-ubiro@.service" SYSTEMD_SUBSTITUTIONS += "KERNEL_MTD:${BMC_KERNEL_MTD}:obmc-flash-bmc-ubiro@.service" +SYSTEMD_SUBSTITUTIONS += "RW_SIZE:${BMC_RW_SIZE}:obmc-flash-bmc-ubirw.service" SRC_URI += "file://obmc-flash-bmc" do_install_append() { 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) diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service index 4a955f2ab..79d0ea387 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service @@ -4,5 +4,5 @@ Description=Create BMC read-write ubi volume [Service] Type=oneshot RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc ubirw {RW_MTD} rwfs +ExecStart=/usr/bin/env obmc-flash-bmc ubirw {RW_MTD} rwfs {RW_SIZE} SyslogIdentifier=obmc-flash-bmc |