diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2019-07-29 22:39:00 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-23 15:52:32 +0300 |
| commit | 661cf398d55957e6edc8f0cdd32770ac5c86b93f (patch) | |
| tree | a0301a6acb94b7b44a178bab5e53acddbd9ac665 | |
| parent | cf58af09282498135ea08d3474fd245a08d30d1d (diff) | |
| download | openbmc-661cf398d55957e6edc8f0cdd32770ac5c86b93f.tar.xz | |
image_types_phosphor: Rename mk_nor_image()
The mk_nor_image() function just creates an empty image file. Rename it
to mk_empty_image() so that it makes more sense when used to create a
file for other chips such as a mmc instead of a nor, like an empty rwfs
ext4 image file.
(From meta-phosphor rev: fdb81a30d7e86309aeafc6b6ab1ebf8f9cf93d88)
Change-Id: I31231ddaec5a8c195da315841e59ecdfb16647a5
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
| -rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 05f58b2e6..d5ace1610 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -85,7 +85,7 @@ FLASH_STATIC_RWFS_CMD_static-rwfs-jffs2 = "${JFFS2_RWFS_CMD}" FLASH_UBI_RWFS_CMD_ubi-rwfs-jffs2 = "${JFFS2_RWFS_CMD}" FLASH_UBI_RWFS_CMD_ubi-rwfs-ubifs = "${UBIFS_RWFS_CMD}" -mk_nor_image() { +mk_empty_image() { image_dst="$1" image_size_kb=$2 dd if=/dev/zero bs=1k count=$image_size_kb \ @@ -170,7 +170,7 @@ do_make_ubi() { ubinize -p ${FLASH_PEB_SIZE}KiB -m ${FLASH_PAGE_SIZE} -o ubi-img $cfg # Concatenate the uboot and ubi partitions - mk_nor_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd ${FLASH_SIZE} + mk_empty_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd ${FLASH_SIZE} dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ if=${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} \ of=${IMGDEPLOYDIR}/${IMAGE_NAME}.ubi.mtd @@ -191,7 +191,7 @@ do_make_ubi[depends] += " \ do_mk_static_nor_image() { # Assemble the flash image - mk_nor_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.static.mtd ${FLASH_SIZE} + mk_empty_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.static.mtd ${FLASH_SIZE} } python do_generate_static() { |