From 9939d67d902eb358ca64e906008af5fb3a8974c1 Mon Sep 17 00:00:00 2001 From: Christophe Priouzeau Date: Mon, 19 Apr 2021 10:58:45 +0200 Subject: [PATCH] WIC: stm32mp15: align fsbl name with storage name Signed-off-by: Christophe Priouzeau --- wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in | 4 ++-- wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in | 4 ++-- wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in | 4 ++-- wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in index 3455820..cc7c91c 100644 --- a/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-optee-1GB.wks.in @@ -11,8 +11,8 @@ # Warning: the first stage of boot (here fsbl1, fsbl2, ssbl) 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-dk2-mmc0.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-mmc0.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +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 ssbl --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=ssbl --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M diff --git a/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in index f027041..5fca866 100644 --- a/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-optee-vendorfs-1GB.wks.in @@ -11,8 +11,8 @@ # Warning: the first stage of boot (here fsbl1, fsbl2, ssbl) 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-dk2-mmc0.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-mmc0.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +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 ssbl --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=ssbl --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-optee.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M diff --git a/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in index 767ce01..bbc0a7d 100644 --- a/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-trusted-1GB.wks.in @@ -11,8 +11,8 @@ # Warning: the first stage of boot (here fsbl1, fsbl2, ssbl) 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-dk2-mmc0.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-mmc0.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +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 ssbl --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=ssbl --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M diff --git a/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in b/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in index ef4874b..34c9522 100644 --- a/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in +++ b/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in @@ -11,8 +11,8 @@ # Warning: the first stage of boot (here fsbl1, fsbl2, ssbl) 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-dk2-mmc0.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-mmc0.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K +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 ssbl --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=ssbl --sourceparams="file=${DEPLOY_DIR_IMAGE}/fip/fip-stm32mp157c-dk2-trusted.bin" --ondisk mmcblk --part-type 0x8301 --fixed-size 4096K part bootfs --source rawcopy --sourceparams="file=st-image-bootfs-${DISTRO}-${MACHINE}.ext4" --ondisk mmcblk --fstype=ext4 --label bootfs --active --fixed-size 64M