diff options
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 6 | ||||
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index ae90c0e44..f7742c85e 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -27,6 +27,7 @@ IMAGE_TYPEDEP_mtd-ubi-tar = "${FLASH_UBI_BASETYPE}" IMAGE_TYPES_MASKED += "mtd-static mtd-static-alltar mtd-static-tar mtd-ubi mtd-ubi-tar" # 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 @@ -36,13 +37,18 @@ FLASH_NOR_UBI_OVERHEAD ?= "64" # Fixed partition offsets FLASH_UBOOT_OFFSET ?= "0" FLASH_KERNEL_OFFSET ?= "512" +FLASH_KERNEL_OFFSET_flash-131072 ?= "1024" FLASH_UBI_OFFSET ?= "${FLASH_KERNEL_OFFSET}" FLASH_ROFS_OFFSET ?= "4864" +FLASH_ROFS_OFFSET_flash-131072 ?= "10240" FLASH_RWFS_OFFSET ?= "28672" +FLASH_RWFS_OFFSET_flash-131072 ?= "98304" # UBI volume sizes in KB unless otherwise noted. FLASH_UBI_RWFS_SIZE ?= "6144" +FLASH_UBI_RWFS_SIZE_flash-131072 ?= "32768" FLASH_UBI_RWFS_TXT_SIZE ?= "6MiB" +FLASH_UBI_RWFS_TXT_SIZE_flash-131072 ?= "32MiB" SIGNING_KEY ?= "${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv" INSECURE_KEY = "${@'${SIGNING_KEY}' == '${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv'}" diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 6b0a78ec0..0280133fe 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -41,7 +41,10 @@ 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" 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" |