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

FLASHLAYOUT: Fix to be able to flash nor+nand

This commit is contained in:
christophe montaud 2019-03-15 11:24:00 +01:00 committed by Christophe Priouzeau
parent e392566017
commit 7371f14c6e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/machine/include/st-machine-flashlayout-stm32mp.inc
View File

@ -105,14 +105,14 @@ FLASHLAYOUT_PARTITION_LABELS_basic_sdcard = "fsbl1-boot ssbl-boot fsbl1
FLASHLAYOUT_PARTITION_LABELS_optee_emmc = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl teeh teed teex bootfs vendorfs rootfs userfs"
FLASHLAYOUT_PARTITION_LABELS_optee_nand-4-256 = "fsbl1-boot ssbl-boot fsbl1 ssbl ssbl2 teeh teed teex ubifs"
FLASHLAYOUT_PARTITION_LABELS_optee_nor-nand-4-256 = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo teeh teed teex empty empty2 empty3 ubifs"
FLASHLAYOUT_PARTITION_LABELS_optee_nor-nand-4-256 = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo teeh teed teex empty empty2 empty3 empty4 ubifs"
FLASHLAYOUT_PARTITION_LABELS_optee_nor-emmc = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo teeh teed teex empty bootfs vendorfs rootfs userfs"
FLASHLAYOUT_PARTITION_LABELS_optee_nor-sdcard = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo teeh teed teex empty bootfs vendorfs rootfs userfs"
FLASHLAYOUT_PARTITION_LABELS_optee_sdcard = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl teeh teed teex bootfs vendorfs rootfs userfs"
FLASHLAYOUT_PARTITION_LABELS_trusted_emmc = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl bootfs vendorfs rootfs userfs"
FLASHLAYOUT_PARTITION_LABELS_trusted_nand-4-256 = "fsbl1-boot ssbl-boot fsbl1 ssbl ssbl2 ubifs"
FLASHLAYOUT_PARTITION_LABELS_trusted_nor-nand-4-256 = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo empty empty2 empty3 ubifs"
FLASHLAYOUT_PARTITION_LABELS_trusted_nor-nand-4-256 = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo empty empty2 empty3 empty4 ubifs"
FLASHLAYOUT_PARTITION_LABELS_trusted_nor-emmc = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo empty bootfs vendorfs rootfs userfs"
FLASHLAYOUT_PARTITION_LABELS_trusted_nor-sdcard = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl logo empty bootfs vendorfs rootfs userfs"
FLASHLAYOUT_PARTITION_LABELS_trusted_sdcard = "fsbl1-boot ssbl-boot fsbl1 fsbl2 ssbl bootfs vendorfs rootfs userfs"
@ -136,6 +136,7 @@ FLASHLAYOUT_PARTITION_ENABLE_ssbl-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE_empty = "PE"
FLASHLAYOUT_PARTITION_ENABLE_empty2 = "PE"
FLASHLAYOUT_PARTITION_ENABLE_empty3 = "PE"
FLASHLAYOUT_PARTITION_ENABLE_empty4 = "PE"
FLASHLAYOUT_PARTITION_ENABLE_logo = "PE"
# -----------------------------------------------------------------------------
@ -164,6 +165,7 @@ FLASHLAYOUT_PARTITION_ID_teex = "0x0C"
FLASHLAYOUT_PARTITION_ID_empty = "0x10"
FLASHLAYOUT_PARTITION_ID_empty2 = "0x11"
FLASHLAYOUT_PARTITION_ID_empty3 = "0x12"
FLASHLAYOUT_PARTITION_ID_empty4 = "0x13"
FLASHLAYOUT_PARTITION_ID_logo = "0x20"
FLASHLAYOUT_PARTITION_ID_ubifs = "0x21"
FLASHLAYOUT_PARTITION_ID_bootfs = "0x21"
@ -190,6 +192,7 @@ FLASHLAYOUT_PARTITION_DEVICE_nor-emmc_userfs = "${DEVICE_EMMC}"
FLASHLAYOUT_PARTITION_DEVICE_nor-nand-4-256 = "${DEVICE_NOR}"
FLASHLAYOUT_PARTITION_DEVICE_nor-nand-4-256_empty2 = "${DEVICE_NAND}"
FLASHLAYOUT_PARTITION_DEVICE_nor-nand-4-256_empty3 = "${DEVICE_NAND}"
FLASHLAYOUT_PARTITION_DEVICE_nor-nand-4-256_empty4 = "${DEVICE_NAND}"
FLASHLAYOUT_PARTITION_DEVICE_nor-nand-4-256_ubifs = "${DEVICE_NAND}"
FLASHLAYOUT_PARTITION_DEVICE_nor-sdcard = "${DEVICE_NOR}"
FLASHLAYOUT_PARTITION_DEVICE_nor-sdcard_bootfs = "${DEVICE_SDCARD}"
@ -232,6 +235,7 @@ FLASHLAYOUT_PARTITION_SIZE_teex = "256"
FLASHLAYOUT_PARTITION_SIZE_empty = "0"
FLASHLAYOUT_PARTITION_SIZE_empty2 = "${FLASHLAYOUT_PARTITION_SIZE_nand-4-256_fsbl1}"
FLASHLAYOUT_PARTITION_SIZE_empty3 = "${FLASHLAYOUT_PARTITION_SIZE_ssbl}"
FLASHLAYOUT_PARTITION_SIZE_empty4 = "${FLASHLAYOUT_PARTITION_SIZE_ssbl2}"
# Specific override for partition size as the configuration should follow
# the U-Boot source code where these partition sizes are hard coded
FLASHLAYOUT_PARTITION_SIZE_nand-4-256_teeh = "512"

3
files/flashlayouts/FlashLayout_nor-nand-4-256_stm32mp157c-ev1_sample.tsv
View File

@ -8,7 +8,8 @@ PE 0x20 logo Binary nor0 0x00280000 none
PE 0x10 empty Binary nor0 0x002C0000 none
PE 0x11 empty2 Binary nand0 0x00000000 none
PE 0x12 empty3 Binary nand0 0x00200000 none
P 0x21 ubifs System nand0 0x00400000 st-image-weston-openstlinux-weston-stm32mp1_nand_4_256_multivolume.ubi
PE 0x13 empty4 Binary nand0 0x00400000 none
P 0x21 ubifs System nand0 0x00600000 st-image-weston-openstlinux-weston-stm32mp1_nand_4_256_multivolume.ubi
PED 0x08 emmc-fsbl1 Binary mmc1 boot1 none
PED 0x09 emmc-fsbl2 Binary mmc1 boot2 none
PED 0x30 emmc-all RawImage mmc1 0x0 none

1 #Opt Id Name Type IP Offset Binary
8 PE 0x10 empty Binary nor0 0x002C0000 none
9 PE 0x11 empty2 Binary nand0 0x00000000 none
10 PE 0x12 empty3 Binary nand0 0x00200000 none
11 P PE 0x21 0x13 ubifs empty4 System Binary nand0 0x00400000 st-image-weston-openstlinux-weston-stm32mp1_nand_4_256_multivolume.ubi none
12 P 0x21 ubifs System nand0 0x00600000 st-image-weston-openstlinux-weston-stm32mp1_nand_4_256_multivolume.ubi
13 PED 0x08 emmc-fsbl1 Binary mmc1 boot1 none
14 PED 0x09 emmc-fsbl2 Binary mmc1 boot2 none
15 PED 0x30 emmc-all RawImage mmc1 0x0 none