summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass
diff options
context:
space:
mode:
authorEd Tanous <ed.tanous@intel.com>2019-07-31 20:43:37 +0300
committerEd Tanous <ed.tanous@intel.com>2019-08-01 18:19:38 +0300
commitd0f63ef62c76c932a2003eaa42c0b250065ae06f (patch)
tree4c0e3cb32dc80f80460bdbf82ff6d401d4ff194f /meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass
parentb4f66bacb1b8e661d794fa7a189e2f66f5092e2e (diff)
downloadopenbmc-d0f63ef62c76c932a2003eaa42c0b250065ae06f.tar.xz
Update to internal 7-31-19
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass')
-rw-r--r--meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass b/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass
index 24469356f..f90a19c4b 100644
--- a/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass
+++ b/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass
@@ -19,11 +19,13 @@ IMAGE_TYPES_MASKED += "mtd-auto"
# Flash characteristics in KB unless otherwise noted
python() {
+ types = d.getVar('IMAGE_FSTYPES', True).split()
+
# TODO: find partition list in DTS
d.setVar('FLASH_UBOOT_OFFSET', str(0))
- if d.getVar('IMAGE_TYPE', True) == 'pfr':
+ if 'intel-pfr' in types:
d.setVar('FLASH_SIZE', str(128*1024))
- DTB_FULL_FIT_IMAGE_OFFSETS = [0x1100000]
+ DTB_FULL_FIT_IMAGE_OFFSETS = [0xb00000]
else:
d.setVar('FLASH_SIZE', str(64*1024))
DTB_FULL_FIT_IMAGE_OFFSETS = [0x80000, 0x2480000]
@@ -42,7 +44,7 @@ mk_nor_image() {
}
do_generate_auto() {
- bbdebug 1 "do_generate_auto IMAGE_TYPE=${IMAGE_TYPE} size=${FLASH_SIZE}KB (${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.auto.mtd)"
+ bbdebug 1 "do_generate_auto IMAGE_TYPES=${IMAGE_TYPES} size=${FLASH_SIZE}KB (${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.auto.mtd)"
# Assemble the flash image
mk_nor_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.auto.mtd ${FLASH_SIZE}
dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \