public
/
meta-st-stm32mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added removal for the most used wic types from custom images 

Suggested-by: Dimitris Tassopoulos <dimtass@gmail.com>
https://github.com/STMicroelectronics/meta-st-stm32mp/pull/14

Change-Id: Ifa56129da5c76bd6181618f9f906169becff23bd
This commit is contained in:
Lionel VITTE 2020-05-06 15:10:42 +02:00 committed by Romuald JEANNE
parent 0660d5d265
commit b87e555b44
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/machine/include/st-machine-common-stm32mp.inc
View File

@ -162,7 +162,8 @@ UBINIZE_ARGS_nand_4_256 = "--min-io-size 4096 --peb-size 256KiB"
EXTRA_UBIFS_SIZE_nand_4_256 = "2304" EXTRA_UBIFS_SIZE_nand_4_256 = "2304"
# Default FSTYPES requested # Default FSTYPES requested
IMAGE_FSTYPES ?= "tar.xz ext4" WKS_IMAGE_FSTYPES ?= ""
IMAGE_FSTYPES ?= "${WKS_IMAGE_FSTYPES} tar.xz ext4"
# Define specific EXT4 command line: # Define specific EXT4 command line:
# - Create minimal inode number (as it is done by default in image_types.bbclass) # - Create minimal inode number (as it is done by default in image_types.bbclass)

2
conf/machine/stm32mp1-disco.conf
View File

@ -96,5 +96,5 @@ TRUSTED_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-d
OPTEE_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in','sdcard-stm32mp157c-dk2-optee-1GB.wks.in',d)}" OPTEE_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in','sdcard-stm32mp157c-dk2-optee-1GB.wks.in',d)}"
# for generated a WIC file, please uncomment the 2 following lines or add them to local.conf # for generated a WIC file, please uncomment the 2 following lines or add them to local.conf
#IMAGE_FSTYPES += "wic ext4" #WKS_IMAGE_FSTYPES += "wic wic.bz2 wic.bmap"
#WKS_FILE += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', '${OPTEE_WIC_FILE}', '${TRUSTED_WIC_FILE}', d)}" #WKS_FILE += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', '${OPTEE_WIC_FILE}', '${TRUSTED_WIC_FILE}', d)}"

3
recipes-st/images/st-image-bootfs.bb
View File

@ -3,7 +3,8 @@ LICENSE = "MIT"
inherit core-image inherit core-image
IMAGE_FSTYPES_remove = "wic" # WIC image generation is not needed for this image
IMAGE_FSTYPES_remove = "${WKS_IMAGE_FSTYPES}"
IMAGE_NAME_SUFFIX = ".${STM32MP_BOOTFS_LABEL}fs" IMAGE_NAME_SUFFIX = ".${STM32MP_BOOTFS_LABEL}fs"

3
recipes-st/images/st-image-userfs.bb
View File

@ -3,7 +3,8 @@ LICENSE = "MIT"
inherit core-image inherit core-image
IMAGE_FSTYPES_remove = "wic" # WIC image generation is not needed for this image
IMAGE_FSTYPES_remove = "${WKS_IMAGE_FSTYPES}"
IMAGE_NAME_SUFFIX = ".${STM32MP_USERFS_LABEL}" IMAGE_NAME_SUFFIX = ".${STM32MP_USERFS_LABEL}"

3
recipes-st/images/st-image-vendorfs.bb
View File

@ -3,7 +3,8 @@ LICENSE = "MIT"
inherit core-image inherit core-image
IMAGE_FSTYPES_remove = "wic" # WIC image generation is not needed for this image
IMAGE_FSTYPES_remove = "${WKS_IMAGE_FSTYPES}"
IMAGE_NAME_SUFFIX = ".${STM32MP_VENDORFS_LABEL}" IMAGE_NAME_SUFFIX = ".${STM32MP_VENDORFS_LABEL}"