OPTEE-OS-STM32MP: update to 3.12.0-stm32mp-r1

Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
2021-03-26 16:55:54 +01:00
1 parent ee3b4ddd69
commit 57ece9a998
@@ -68,71 +68,19 @@ MANDATORY: You must update sources

 5. Build optee-os source code:
 --------------------------------
-To compile optee-os source code
-    $> make -f $PWD/../Makefile.sdk
-or for a specific config :
-    $ make -f $PWD/../Makefile.sdk CFG_EMBED_DTB_SOURCE_FILE=stm32mp157c-ev1
+Since OpenSTLinux has activated FIP by default, so the FIP_artifacts should be specified before launching compilation
+  - In case of using SOURCES-xxxx.tar.gz of Developer package the FIP_DEPLOYDIR_ROOT should be set as below:
+    $> export FIP_DEPLOYDIR_ROOT=$PWD/../../FIP_artifacts

-Binaries generated are as follow: 
-##> PWD/../build/tee-*-optee.stm32
+To compile optee-os source code
+    $> make -f $PWD/../Makefile.sdk all
+or for a specific config :
+    $ make -f $PWD/../Makefile.sdk CFG_EMBED_DTB_SOURCE_FILE=stm32mp157c-ev1 all
+
+The generated FIP images are available in $FIP_DEPLOYDIR_ROOT/fip


 6. Update software on board:
 ----------------------------
-6.1. partitioning of binaries:
-----------------------------
-Using the above command, the OP-TEE provides 3 binary files which MUST
-be loaded in their respective partition as listed below:
- "tee-header-*-optee.stm32" in "teeh" partition
- "tee-pageable-*-optee.stm32" in "teed" partition
- "tee-pager-*-optee.stm32" in "teex" partition
+Please use STM32CubeProgrammer and only tick the ssbl-boot and fip partitions (more informations on the wiki website http://wiki.st.com/stm32mpu)

-6.2. Update via SDCARD:
-----------------------
-Copy each binary to its dedicated partition, on SDCARD/USB disk
-the OP-TEE partitions are the partitions 4/5/6:
- - SDCARD: /dev/mmcblkXp4 /dev/mmcblkXp5 /dev/mmcblkXp6
-           (where X is the instance number)
- - SDCARD via USB reader: /dev/sdX4 /dev/sdX5 /dev/sdX6
-                          (where X is the instance identifier)
-So, for each binary:
-$ dd if=<op-tee binary> of=/dev/<device partition> bs=1M conv=fdatasync
-
-6.3. Update via USB mass storage on U-boot:
-------------------------------------------
-* Plug the SDCARD on Board.
-* Start the board and stop on U-boot shell:
- Hit any key to stop autoboot: 0
-  STM32MP>
-* plug an USB cable between the PC and the board via USB OTG port.
-* On U-Boot shell, call the USB mass storage functionnality:
- STM32MP> ums 0 mmc 0
-
- ums <USB controller> <dev type: mmc|usb> <dev[:part]>
-  ex.:
-For SDCARD:      ums 0 mmc 0
-For USB disk:    ums 0 usb 0
-
-* Follow section 6.2 to load the "tee-*-optee.stm32" image files in the target
-  partitions /dev/sd<X><Y>.
-
-
-
-FAQ: Partitions identification
-
-To find the partition associated to a specific label, connect the
-SDCARD to your PC or run on target U-boot 'ums' command
-and list /dev/disk/by-partlabel/ content, i.e:
-
-  $ ls -l /dev/disk/by-partlabel/
-  total 0
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 bootfs -> ../../mmcblk0p7
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 fsbl1 -> ../../mmcblk0p1     # FSBL (TF-A)
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 fsbl2 -> ../../mmcblk0p2     # FSBL backup (TF-A backup – same content as FSBL)
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 rootfs -> ../../mmcblk0p9
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 ssbl -> ../../mmcblk0p3      # SSBL (U-Boot)
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 teed -> ../../mmcblk0p5      # TEED (OP-TEE tee-pageable)
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 teeh -> ../../mmcblk0p4      # TEEH (OP-TEE tee-header)
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 teex -> ../../mmcblk0p6      # TEEX (OP-TEE tee-pager)
-  lrwxrwxrwx 1 root root 16 Jan 23 19:11 userfs -> ../../mmcblk0p10
-  lrwxrwxrwx 1 root root 15 Jan 23 19:11 vendorfs -> ../../mmcblk0p8