Skip to content
Snippets Groups Projects
Verified Commit fc6e5dce authored by Andrei Gherzan's avatar Andrei Gherzan :penguin:
Browse files

wic: Rename partitions as per the x-wic.inc changes 


x-boot - boot
x-sys-a - sys-a
x-sys-b - sys-b
x-dev-data - devdata
x-sys-data - sysdata
x-app-data - appdata

Signed-off-by: Andrei Gherzan's avatarAndrei Gherzan <andrei.gherzan@huawei.com>
parent aaac04d6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
meta-ohos-core/wic/x-avenger96.wks.in
+ 4
− 4
View file @ fc6e5dce
......@@ -8,9 +8,9 @@
# partitions and common partitions for the rest of the entries.
#
# Disk layout:
# -- ------- ------- ------ -------- --------- --------- ------------ ------------ ------------
# | | fsbl1 | fsbl2 | ssbl | x-boot | x-sys-a | x-sys-b | x-dev-data | x-sys-data | x-app-data |
# -- ------- ------- ------ -------- --------- --------- ------------ ------------ ------------
# -- ------- ------- ------ ------ ------- ------- --------- --------- ---------
# | | fsbl1 | fsbl2 | ssbl | boot | sys-a | sys-b | devdata | sysdata | appdata |
# -- ------- ------- ------ ------ ------- ------- --------- --------- ---------
# ^ ^ ^ ^ ^
# | | | | |
# 0 17KiB 273KiB 529KiB 4096KiB
......@@ -20,7 +20,7 @@ bootloader --ptable gpt
part fsbl1 --source rawcopy --sourceparams="file=arm-trusted-firmware/tf-a-stm32mp157a-av96-sdcard.stm32" --part-name fsbl1 --part-type 8DA63339-0007-60C0-C436-083AC8230908 --offset 17
part fsbl2 --source rawcopy --sourceparams="file=arm-trusted-firmware/tf-a-stm32mp157a-av96-sdcard.stm32" --part-name fsbl2 --part-type 8DA63339-0007-60C0-C436-083AC8230908 --offset 273
part fip --source rawcopy --sourceparams="file=fip/fip-stm32mp157a-av96-trusted.bin" --part-name fip --part-type 8DA63339-0007-60C0-C436-083AC8230908 --offset 529
part --source bootimg-partition --fstype=ext4 --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
part --source bootimg-partition --fstype=ext4 --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
${WIC_DEVDATA_PARTITION}
......
meta-ohos-core/wic/x-efi-systemd-microcode.wks.in
+ 4
− 4
View file @ fc6e5dce
......@@ -9,16 +9,16 @@
# Based on OE-core's systemd-bootdisk.wks file.
#
# Disk layout:
# -- -------- --------- --------- ------------ ------------ ------------
# | | x-boot | x-sys-a | x-sys-b | x-dev-data | x-sys-data | x-app-data |
# -- -------- --------- --------- ------------ ------------ ------------
# -- ------ ------- ------- --------- --------- ---------
# | | boot | sys-a | sys-b | devdata | sysdata | appdata |
# -- ------ ------- ------- --------- --------- ---------
# ^ ^
# | |
# 0 4096KiB
bootloader --ptable gpt --timeout=5 --append=" rootfstype=ext4 "
part --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
part --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
${WIC_DEVDATA_PARTITION}
......
meta-ohos-core/wic/x-imx-uboot-bootpart.wks.in
+ 7
− 7
View file @ fc6e5dce
......@@ -8,12 +8,12 @@
# with support for common partitions.
#
# Disk layout:
# - -------- --------- --------- ------------------------------------------
# | | | | | extended |
# | | | | | ------------ ------------ ------------ |
# | | x-boot | x-sys-a | x-sys-b | | x-dev-data | x-sys-data | x-app-data | |
# | | | | | ------------ ------------ ------------ |
# - -------- --------- --------- ------------------------------------------
# - ------ ------- ------- ---------------------------------
# | | | | | extended |
# | | | | | --------- --------- --------- |
# | | boot | sys-a | sys-b | | devdata | sysdata | appdata | |
# | | | | | --------- --------- --------- |
# - ------ ------- ------- ---------------------------------
# ^ ^
# | |
# 0 |
......@@ -22,7 +22,7 @@
bootloader --ptable msdos
part u-boot --source rawcopy --sourceparams="file=${UBOOT_BINARY}" --no-table --align 1
part --source bootimg-partition --fstype=vfat --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
part --source bootimg-partition --fstype=vfat --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
${WIC_DEVDATA_PARTITION}
......
meta-ohos-core/wic/x-qemux86-directdisk.wks.in
+ 7
− 7
View file @ fc6e5dce
......@@ -7,12 +7,12 @@
# partitions.
#
# Disk layout:
# - -------- --------- --------- ------------------------------------------
# | | | | | extended |
# | | | | | ------------ ------------ ------------ |
# | | x-boot | x-sys-a | x-sys-b | | x-dev-data | x-sys-data | x-app-data | |
# | | | | | ------------ ------------ ------------ |
# - -------- --------- --------- ------------------------------------------
# - ------ ------- ------- ---------------------------------
# | | | | | extended |
# | | | | | --------- --------- --------- |
# | | boot | sys-a | sys-b | | devdata | sysdata | appdata | |
# | | | | | --------- --------- --------- |
# - ------ ------- ------- ---------------------------------
# ^ ^
# | |
# 0 |
......@@ -20,7 +20,7 @@
bootloader --source bootimg-pcbios --timeout=0 --append="oprofile.timer=1 rootfstype=${ROOT_FSTYPE}"
part --source bootimg-pcbios --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
part --source bootimg-pcbios --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
${WIC_DEVDATA_PARTITION}
......
meta-ohos-core/wic/x-raspberrypi.wks.in
+ 7
− 7
View file @ fc6e5dce
......@@ -12,12 +12,12 @@
# https://elinux.org/RPi_Easy_SD_Card_Setup
#
# Disk layout:
# - -------- --------- --------- ------------------------------------------
# | | | | | extended |
# | | | | | ------------ ------------ ------------ |
# | | x-boot | x-sys-a | x-sys-b | | x-dev-data | x-sys-data | x-app-data | |
# | | | | | ------------ ------------ ------------ |
# - -------- --------- --------- ------------------------------------------
# - ------ ------- ------- ---------------------------------
# | | | | | extended |
# | | | | | --------- --------- --------- |
# | | boot | sys-a | sys-b | | devdata | sysdata | appdata | |
# | | | | | --------- --------- --------- |
# - ------ ------- ------- ---------------------------------
# ^ ^
# | |
# 0 |
......@@ -25,7 +25,7 @@
bootloader --ptable msdos
part --source bootimg-partition --fstype=vfat --label x-boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
part --source bootimg-partition --fstype=vfat --label boot --align 4096 --fixed-size ${BOOT_PARTITION_SIZE} --active --offset 4096
${WIC_ROOTA_PARTITION}
${WIC_ROOTB_PARTITION}
${WIC_DEVDATA_PARTITION}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent