From 5d55695e90bb18fcc9b4562c4e73159be3f5e56c Mon Sep 17 00:00:00 2001 From: Priouzeau Christophe Date: Tue, 28 Jan 2020 14:28:16 +0100 Subject: [PATCH] wks: rename and use variable Rename wks file and use variable ${DISTRO} and ${MACHINE} Input of this commit comr from Pull Request: #7 Signed-off-by: Leon Anavi --- ...> sdcard-stm32mp157c-dk2-optee-1GB.wks.in} | 19 +++++++++---------- ...stm32mp157c-dk2-optee-vendorfs-1GB.wks.in} | 6 +++--- ...sdcard-stm32mp157c-dk2-trusted-1GB.wks.in} | 11 +++++------ ...m32mp157c-dk2-trusted-vendorfs-1GB.wks.in} | 6 +++--- 4 files changed, 20 insertions(+), 22 deletions(-) rename wic/{sdcard-stm32mp157c-ev1-optee-1GB.wks => sdcard-stm32mp157c-dk2-optee-1GB.wks.in} (65%) rename wic/{sdcard-stm32mp157c-dk2-optee-1GB.wks => sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in} (86%) rename wic/{sdcard-stm32mp157c-ev1-trusted-1GB.wks => sdcard-stm32mp157c-dk2-trusted-1GB.wks.in} (66%) rename wic/{sdcard-stm32mp157c-dk2-trusted-1GB.wks => sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in} (81%) diff --git a/wic/sdcard-stm32mp157c-ev1-optee-1GB.wks b/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in similarity index 65% rename from wic/sdcard-stm32mp157c-ev1-optee-1GB.wks rename to wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in index 227b10a..c17d0e1 100644 --- a/wic/sdcard-stm32mp157c-ev1-optee-1GB.wks +++ b/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in @@ -6,22 +6,21 @@ # - ----- --------- -------------- ----------------------------------------------------- # ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ # | | | | | | | | | | | -# 0 17kB 529kB 2.5MB 2.8MB 3MB 3.3MB 67.3MiB 83.3MiB 852Mib 1024MiB +# 0 17kB 529kB 2.5MB 2.8MB 3MB 3.3MB 67.3MiB 83.3MB 851.3Mb 1024MB # # Warning: the first stage of boot (here fsbl1, fsbl2, ssbl) MUST be on GPT partition to be detected. # -part fsbl1 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --label fsbl1 --part-type 0x8301 --fixed-size 256K --align 17 -part fsbl2 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --label fsbl2 --part-type 0x8301 --fixed-size 256K -part ssbl --source gptcopy --sourceparams="file=u-boot-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 2048K +part fsbl1 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label fsbl1 --part-type 0x8301 --fixed-size 256K --align 17 +part fsbl2 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label fsbl2 --part-type 0x8301 --fixed-size 256K +part ssbl --source gptcopy --sourceparams="file=u-boot-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 2048K -part teeh --source gptcopy --sourceparams="file=tee-header_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K -part teed --source gptcopy --sourceparams="file=tee-pageable_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K -part teex --source gptcopy --sourceparams="file=tee-pager_v2-stm32mp157c-ev1-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K +part teeh --source gptcopy --sourceparams="file=tee-header_v2-stm32mp157c-dk2-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K +part teed --source gptcopy --sourceparams="file=tee-pageable_v2-stm32mp157c-dk2-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K +part teex --source gptcopy --sourceparams="file=tee-pager_v2-stm32mp157c-dk2-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K -part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --active --fixed-size 16M +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 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks b/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in similarity index 86% rename from wic/sdcard-stm32mp157c-dk2-optee-1GB.wks rename to wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in index bd1ab8d..9c131fb 100644 --- a/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks +++ b/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in @@ -19,9 +19,9 @@ part teeh --source gptcopy --sourceparams="file=tee-header_v2-stm32mp157c-dk2-o part teed --source gptcopy --sourceparams="file=tee-pageable_v2-stm32mp157c-dk2-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K part teex --source gptcopy --sourceparams="file=tee-pager_v2-stm32mp157c-dk2-optee.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 256K -part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --active --fixed-size 16M +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 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 172M bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-ev1-trusted-1GB.wks b/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in similarity index 66% rename from wic/sdcard-stm32mp157c-ev1-trusted-1GB.wks rename to wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in index 529760e..125de25 100644 --- a/wic/sdcard-stm32mp157c-ev1-trusted-1GB.wks +++ b/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in @@ -11,13 +11,12 @@ # Warning: the first stage of boot (here fsbl1, fsbl2, ssbl) MUST be on GPT partition to be detected. # -part fsbl1 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --label fsbl1 --part-type 0x8301 --fixed-size 256K --align 17 -part fsbl2 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --label fsbl2 --part-type 0x8301 --fixed-size 256K -part ssbl --source gptcopy --sourceparams="file=u-boot-stm32mp157c-ev1-trusted.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 2048K +part fsbl1 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label fsbl1 --part-type 0x8301 --fixed-size 256K --align 17 +part fsbl2 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label fsbl2 --part-type 0x8301 --fixed-size 256K +part ssbl --source gptcopy --sourceparams="file=u-boot-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 2048K -part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --active --fixed-size 16M +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 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 173M +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 173M bootloader --ptable gpt diff --git a/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks b/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in similarity index 81% rename from wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks rename to wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in index 3741ca2..19d022a 100644 --- a/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks +++ b/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in @@ -15,9 +15,9 @@ part fsbl1 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-dk2-trusted.st part fsbl2 --source gptcopy --sourceparams="file=tf-a-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label fsbl2 --part-type 0x8301 --fixed-size 256K part ssbl --source gptcopy --sourceparams="file=u-boot-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --label ssbl --part-type 0x8301 --fixed-size 2048K -part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M -part vendorfs --source rawcopy --sourceparams="file=st-image-vendorfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label vendorfs --active --fixed-size 16M +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 -part usrfs --source rawcopy --sourceparams="file=st-image-userfs-openstlinux-weston-stm32mp1.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 173M +part usrfs --source rawcopy --sourceparams="file=st-image-userfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label userfs --active --fixed-size 173M bootloader --ptable gpt