diff --git a/wic/sdcard-stm32mp135f-dk-optee-1GB.wks.in b/wic/sdcard-stm32mp135f-dk-optee-1GB.wks.in new file mode 100644 index 0000000..7fb6998 --- /dev/null +++ b/wic/sdcard-stm32mp135f-dk-optee-1GB.wks.in @@ -0,0 +1,36 @@ +# short-description: Create SD card image with a boot partition (1GB) +# long-description: Creates a partitioned SD card image (1GB) +# +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | rootfs | userfs | +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 898MB 1032MB +# +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. +# + +# FSBL partitions aka TF-A BL2 +part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp135f-dk-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 +part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp135f-dk-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp135f-dk-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp135f-dk-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 + +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs +part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 783M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M + +bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp135f-dk-optee-vendorfs-1GB.wks.in b/wic/sdcard-stm32mp135f-dk-optee-vendorfs-1GB.wks.in new file mode 100644 index 0000000..e283cc3 --- /dev/null +++ b/wic/sdcard-stm32mp135f-dk-optee-vendorfs-1GB.wks.in @@ -0,0 +1,38 @@ +# short-description: Create SD card image with a boot partition (1GB) +# long-description: Creates a partitioned SD card image (1GB) +# +# -------------------------------------------------------------------------------------------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | vendorfs | rootfs | userfs | +# -------------------------------------------------------------------------------------------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 93.9Mb 939MB 1073MB +# +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. +# + +# FSBL partitions aka TF-A BL2 +part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp135f-dk-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 +part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp135f-dk-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp135f-dk-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp135f-dk-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 + +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs +part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M +# Vendorfs +part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --fixed-size 16M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 772M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M + +bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in index f0f125a..294f07d 100644 --- a/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in @@ -1,22 +1,36 @@ # short-description: Create SD card image with a boot partition (1GB) # long-description: Creates a partitioned SD card image (1GB) # -# - ----- --------- -------------- ----------------------------------------------------- -# | | TFA | u-boot | teeh | teed | teex | bootfs | vendorfs | rootfs | userfs | -# - ----- --------- -------------- ----------------------------------------------------- -# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ -# | | | | | | | | | | | -# 0 17kB 529kB 2.5MB 2.8MB 3MB 3.3MB 67.3MiB 83.3MB 851.3Mb 1024MB +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | rootfs | userfs | +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 898MB 1032MB # -# Warning: the first stage of boot (here fsbl1, fsbl2, fip) MUST be on GPT partition to be detected. +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. # +# FSBL partitions aka TF-A BL2 part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -part fip --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 + +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 768M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 783M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in index 43be6f6..6576f0c 100644 --- a/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in @@ -1,23 +1,38 @@ # short-description: Create SD card image with a boot partition (1GB) # long-description: Creates a partitioned SD card image (1GB) # -# - ----- --------- -------------- ----------------------------------------------------- -# | | TFA | u-boot | teeh | teed | teex | bootfs | vendorfs | rootfs | userfs | -# - ----- --------- -------------- ----------------------------------------------------- -# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ -# | | | | | | | | | | | -# 0 17kB 529kB 2.5MB 2.8MB 3MB 3.3MB 67.3MiB 83.3MB 851.3Mb 1024MB +# -------------------------------------------------------------------------------------------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | vendorfs | rootfs | userfs | +# -------------------------------------------------------------------------------------------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 93.9Mb 939MB 1073MB # -# Warning: the first stage of boot (here fsbl1, fsbl2, fip) MUST be on GPT partition to be detected. +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. # +# FSBL partitions aka TF-A BL2 part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -part fip --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 + +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --active --fixed-size 16M -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 768M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M +# Vendorfs +part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --fixed-size 16M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 772M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in index f17e046..5a1f726 100644 --- a/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in @@ -1,22 +1,36 @@ # short-description: Create SD card image with a boot partition (1GB) # long-description: Creates a partitioned SD card image (1GB) # -# - ----- --------- -------------- --------------------------------- -# | | TFA | u-boot | bootfs | vendorfs | rootfs | userfs | -# - ----- --------- -------------- --------------------------------- -# ^ ^ ^ ^ ^ ^ ^ ^ -# | | | | | | | | -# 0 17kB 529kB 4MB 66.5MB 82.5MB 850.5Mb 1024MB +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | rootfs | userfs | +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 898MB 1032MB # -# Warning: the first stage of boot (here fsbl1, fsbl2, fip) MUST be on GPT partition to be detected. +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. # +# FSBL partitions aka TF-A BL2 part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -part fip --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 + +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 768M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 173M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 783M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in index fa7f1f1..c1df4d2 100644 --- a/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in @@ -1,23 +1,38 @@ # short-description: Create SD card image with a boot partition (1GB) # long-description: Creates a partitioned SD card image (1GB) # -# - ----- --------- -------------- --------------------------------- -# | | TFA | u-boot | bootfs | vendorfs | rootfs | userfs | -# - ----- --------- -------------- --------------------------------- -# ^ ^ ^ ^ ^ ^ ^ ^ -# | | | | | | | | -# 0 17kB 529kB 4MB 66.5MB 82.5MB 850.5Mb 1024MB +# -------------------------------------------------------------------------------------------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | vendorfs | rootfs | userfs | +# -------------------------------------------------------------------------------------------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 93.9Mb 939MB 1073MB # -# Warning: the first stage of boot (here fsbl1, fsbl2, fip) MUST be on GPT partition to be detected. +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. # +# FSBL partitions aka TF-A BL2 part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -part fip --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K + +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 + +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --active --fixed-size 16M -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 768M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 173M +# Vendorfs +part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --fixed-size 16M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 772M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-ev1-trusted-1GB.wks.in b/wic/sdcard-stm32mp157c-ev1-trusted-1GB.wks.in index 9c68042..d02b4ab 100644 --- a/wic/sdcard-stm32mp157c-ev1-trusted-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-ev1-trusted-1GB.wks.in @@ -1,28 +1,36 @@ # short-description: Create SD card image with a boot partition (1GB) # long-description: Creates a partitioned SD card image (1GB) # -# - ----- --------- -------------- ----------------------------------------------------- -# | | TFA | u-boot | teeh | teed | teex | bootfs | vendorfs | rootfs | userfs | -# - ----- --------- -------------- ----------------------------------------------------- -# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ -# | | | | | | | | | | | -# 0 17kB 529kB 2.5MB 2.8MB 3MB 3.3MB 67.3MiB 83.3MB 851.3Mb 1024MB +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | rootfs | userfs | +# - -------- ------------- ------ ------ ------------ -------- --------- -------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 898MB 1032MB # -# Warning: the first stage of boot (here fsbl1, fsbl2, fip) MUST be on GPT partition to be detected. +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. # -part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 -part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -part ssbl --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=ssbl --sourceparams="file=${DEPLOY_DIR_IMAGE}/u-boot/u-boot-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 2048K +# FSBL partitions aka TF-A BL2 +part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 +part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -## Please uncomment the 3 following lines if you use an OPTEE config -#part teeh --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=teeh --sourceparams="file=${DEPLOY_DIR_IMAGE}/optee/tee-header_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -#part teed --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=teed --sourceparams="file=${DEPLOY_DIR_IMAGE}/optee/tee-pageable_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 512K -#part teex --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=teex --sourceparams="file=${DEPLOY_DIR_IMAGE}/optee/tee-pager_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-ev1-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-ev1-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 768M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 783M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M -bootloader --ptable gpt \ No newline at end of file +bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-ev1-trusted-vendorfs-1GB.wks.in b/wic/sdcard-stm32mp157c-ev1-trusted-vendorfs-1GB.wks.in index 0324d83..ed3fa91 100644 --- a/wic/sdcard-stm32mp157c-ev1-trusted-vendorfs-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-ev1-trusted-vendorfs-1GB.wks.in @@ -1,28 +1,38 @@ # short-description: Create SD card image with a boot partition (1GB) # long-description: Creates a partitioned SD card image (1GB) # -# - ----- --------- -------------- ----------------------------------------------------- -# | | TFA | u-boot | teeh | teed | teex | bootfs | vendorfs | rootfs | userfs | -# - ----- --------- -------------- ----------------------------------------------------- -# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ -# | | | | | | | | | | | -# 0 17kB 529kB 2.5MB 2.8MB 3MB 3.3MB 67.3MiB 83.3MB 851.3Mb 1024MB +# -------------------------------------------------------------------------------------------- +# | | TFA(2) | Metadata(2) | FIPA | FIPB | U-BOOT ENV | bootfs | vendorfs | rootfs | userfs | +# -------------------------------------------------------------------------------------------- +# ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ +# | | | | | | | | | | | +# 0 17kB 542kB 1.06MB 5.26MB 9.45MB 9.97MB 77.1MB 93.9Mb 939MB 1073MB # -# Warning: the first stage of boot (here fsbl1, fsbl2, fip) MUST be on GPT partition to be detected. +# Warning: the first stage of boot (here fsbl1, fsbl2, metadata1, metadata2, fipa, fipb) MUST be on GPT partition to be detected. # -part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 -part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -part ssbl --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=ssbl --sourceparams="file=${DEPLOY_DIR_IMAGE}/u-boot/u-boot-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 2048K +# FSBL partitions aka TF-A BL2 +part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 +part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-ev1-sdcard.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -## Please uncomment the 3 following lines if you use an OPTEE config -#part teeh --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=teeh --sourceparams="file=${DEPLOY_DIR_IMAGE}/optee/tee-header_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K -#part teed --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=teed --sourceparams="file=${DEPLOY_DIR_IMAGE}/optee/tee-pageable_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 512K -#part teex --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=teex --sourceparams="file=${DEPLOY_DIR_IMAGE}/optee/tee-pager_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +# Metadata partitions +part metadata1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +part metadata2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=metadata2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/metadata.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +# Fip partitions +part fip-a --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-a --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-ev1-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 4fd84c93-54ef-463f-a7ef-ae25ff887087 +part fip-b --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fip-b --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-ev1-trusted.bin" --ondisk mmcblk --part-type 19d5df83-11b0-457b-be2c-7559c13142a5 --fixed-size 4096K --uuid 09c54952-d5bf-45af-acee-335303766fb3 + +# U-BOOT env +part u-boot-env --source empty --part-name=uboot-env --ondisk mmcblk --part-type 0x8301 --fixed-size 512K + +# Bootfs part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --active --fixed-size 16M -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 768M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M +# Vendorfs +part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --fixed-size 16M +# Rootfs +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label rootfs --fixed-size 772M --uuid e91c4e10-16e6-4c0e-bd0e-77becf4a3582 +# Userfs +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --fixed-size 128M -bootloader --ptable gpt \ No newline at end of file +bootloader --ptable gpt