diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-06-19 23:46:02 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-06-20 09:09:35 +0300 |
| commit | 05f3b1b3683d0341ccfef633d08aa2f3a9fd8965 (patch) | |
| tree | 0d69514b3d236c2ceb7e6a990b2d2b728080ee82 /meta-phosphor/classes | |
| parent | f7e361c441b541849cce85880fa4415afcc8da3e (diff) | |
| download | openbmc-05f3b1b3683d0341ccfef633d08aa2f3a9fd8965.tar.xz | |
meta-phosphor: simplify FLASH_SIZE specification
FLASH_SIZE was previously defaulted in a few bbclasses and bbappends,
but this can result in it not being defined in all recipes if the
machine has not overridden the FLASH_SIZE. openbmc/openbmc#3876
reported one such case where the u-boot-fw-utils recipe does not
receive the correct FLASH_SIZE and ends up erasing the wrong flash
region as if it were the u-boot enviroment. Specify it in the common
include so it is available everywhere.
Resolves openbmc/openbmc#3876.
Change-Id: Iacdde1a5d0081b54321110d655da18bb3846cd14
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 1 | ||||
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 63de40e266..70f285a675 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -46,7 +46,6 @@ IMAGE_TYPEDEP:mmc-ext4-tar = "${FLASH_EXT4_BASETYPE}" # Flash characteristics in KB unless otherwise noted DISTROOVERRIDES .= ":flash-${FLASH_SIZE}" -FLASH_SIZE ?= "32768" FLASH_PEB_SIZE ?= "64" # Flash page and overhead sizes in bytes FLASH_PAGE_SIZE ?= "1" diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 9d38adaf7f..b798c6ee03 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -27,7 +27,6 @@ SYSTEMD_SERVICE:phosphor-software-manager-updater-ubi += " \ BMC_RW_MTD ??= "bmc" BMC_RO_MTD ??= "bmc" BMC_KERNEL_MTD ??= "bmc" -FLASH_SIZE ?= "32768" DISTROOVERRIDES .= ":flash-${FLASH_SIZE}" BMC_RW_SIZE ??= "0x600000" BMC_RW_SIZE:flash-131072 = "0x2000000" |