Am Montag, dem 08.09.2025 um 08:33 +0200 schrieb Yannic Moog: > OP-TEE configs are enabled by default, change the doc to no longer > declare OP-TEE as optional. > Further, phycore-imx8mm and imx8mm-phygate-tauri-l use different > build > instructions, so dissolve the common file for building OP-TEE. > > Signed-off-by: Yannic Moog <y.m...@phytec.de> Reviewed-by: Teresa Remmet <t.rem...@phytec.de>
> --- > board/phytec/phycore_imx8mm/MAINTAINERS | 1 - > doc/board/phytec/imx8mm-optee-build.rsti | 14 -------------- > doc/board/phytec/imx8mm-phygate-tauri-l.rst | 19 +++++++++++++------ > doc/board/phytec/phycore-imx8mm.rst | 19 +++++++++++++------ > doc/board/phytec/phycore-imx8mp.rst | 13 +++++-------- > 5 files changed, 31 insertions(+), 35 deletions(-) > > diff --git a/board/phytec/phycore_imx8mm/MAINTAINERS > b/board/phytec/phycore_imx8mm/MAINTAINERS > index > 7631e1cb331b608335620d0db49104459f673d1d..58c5e2d0af9fe404a5995fecc96 > cdbaa5845f979 100644 > --- a/board/phytec/phycore_imx8mm/MAINTAINERS > +++ b/board/phytec/phycore_imx8mm/MAINTAINERS > @@ -9,6 +9,5 @@ F: configs/imx8mm-phygate-tauri-l_defconfig > F: configs/phycore-imx8mm_defconfig > F: doc/board/phytec/imx8mm-phygate-tauri-l.rst > F: doc/board/phytec/index.rst > -F: doc/board/phytec/imx8mm-optee-build.rsti > F: doc/board/phytec/phycore_imx8mm.rst > F: include/configs/phycore_imx8mm.h > diff --git a/doc/board/phytec/imx8mm-optee-build.rsti > b/doc/board/phytec/imx8mm-optee-build.rsti > deleted file mode 100644 > index > c83de5cc7cf4a0229cbd89f4c7d2bfd8448cb735..000000000000000000000000000 > 0000000000000 > --- a/doc/board/phytec/imx8mm-optee-build.rsti > +++ /dev/null > @@ -1,14 +0,0 @@ > -Build the OP-TEE binary (optional) > ----------------------------------- > - > -.. code-block:: bash > - > - $ git clone https://github.com/OP-TEE/optee_os.git > - $ cd optee_os > - $ make CFG_TEE_BENCHMARK=n \ > - CROSS_COMPILE=aarch64-linux-gnu- \ > - O=out/arm \ > - PLATFORM=imx-mx8mmevk \ > - CFG_TZDRAM_START=0x56000000 \ > - CFG_DDR_SIZE=0x80000000 \ > - CFG_UART_BASE=UART3_BASE > diff --git a/doc/board/phytec/imx8mm-phygate-tauri-l.rst > b/doc/board/phytec/imx8mm-phygate-tauri-l.rst > index > 0d9e1024f8c5300e91a3a4c18b2babd5853a0824..7efc9392361b4a867ce2bc18db1 > 1aacf31208800 100644 > --- a/doc/board/phytec/imx8mm-phygate-tauri-l.rst > +++ b/doc/board/phytec/imx8mm-phygate-tauri-l.rst > @@ -9,7 +9,7 @@ Quick Start > ----------- > > - Build the ARM Trusted firmware binary > -- Build the OP-TEE binary (optional) > +- Build the OP-TEE binary > - Get ddr firmware > - Build U-Boot > - Boot > @@ -23,12 +23,19 @@ Build the ARM Trusted firmware binary > $ cd trusted-firmware-a > $ export CROSS_COMPILE=aarch64-linux-gnu- > $ export IMX_BOOT_UART_BASE=0x30880000 > - $ # with optee > - $ make PLAT=imx8mm BL32_BASE=0x56000000 SPD=opteed bl31 > - $ # without optee > - $ make PLAT=imx8mm bl31 > + $ make PLAT=imx8mm BL32_BASE=0xbe000000 SPD=opteed bl31 > > -.. include:: imx8mm-optee-build.rsti > +Build the OP-TEE binary > +----------------------- > + > +.. code-block:: bash > + > + $ git clone https://github.com/OP-TEE/optee_os.git > + $ cd optee_os > + $ make CFG_TEE_BENCHMARK=n \ > + CROSS_COMPILE=aarch64-linux-gnu- \ > + O=out/arm \ > + PLATFORM=imx-mx8mm_phygate_tauri_l > > Get the ddr firmware > -------------------- > diff --git a/doc/board/phytec/phycore-imx8mm.rst > b/doc/board/phytec/phycore-imx8mm.rst > index > 08f5949e02d8d2bfba71867d93c2b3ed8fdc67e2..ba6299a968ae9980d583b87b46d > cccba5aa4a186 100644 > --- a/doc/board/phytec/phycore-imx8mm.rst > +++ b/doc/board/phytec/phycore-imx8mm.rst > @@ -9,7 +9,7 @@ Quick Start > ----------- > > - Build the ARM Trusted firmware binary > -- Build the OP-TEE binary (optional) > +- Build the OP-TEE binary > - Get ddr firmware > - Build U-Boot > - Boot > @@ -23,12 +23,19 @@ Build the ARM Trusted firmware binary > $ cd trusted-firmware-a > $ export CROSS_COMPILE=aarch64-linux-gnu- > $ export IMX_BOOT_UART_BASE=0x30880000 > - $ # with optee > - $ make PLAT=imx8mm BL32_BASE=0x56000000 SPD=opteed bl31 > - $ # without optee > - $ make PLAT=imx8mm bl31 > + $ make PLAT=imx8mm BL32_BASE=0x7e000000 SPD=opteed bl31 > > -.. include:: imx8mm-optee-build.rsti > +Build the OP-TEE binary > +----------------------- > + > +.. code-block:: bash > + > + $ git clone https://github.com/OP-TEE/optee_os.git > + $ cd optee_os > + $ make CFG_TEE_BENCHMARK=n \ > + CROSS_COMPILE=aarch64-linux-gnu- \ > + O=out/arm \ > + PLATFORM=imx-mx8mm_phyboard_polis > > Get the ddr firmware > -------------------- > diff --git a/doc/board/phytec/phycore-imx8mp.rst > b/doc/board/phytec/phycore-imx8mp.rst > index > 50be99126537a2dc5323bd49c1513b196182c5f3..e1385be25e1a862db7021e29cd5 > d0d3ba68cc01b 100644 > --- a/doc/board/phytec/phycore-imx8mp.rst > +++ b/doc/board/phytec/phycore-imx8mp.rst > @@ -9,7 +9,7 @@ Quick Start > ----------- > > - Build the ARM Trusted firmware binary > -- Build the OP-TEE binary (optional) > +- Build the OP-TEE binary > - Get ddr firmware > - Build U-Boot > - Boot > @@ -23,13 +23,10 @@ Build the ARM Trusted firmware binary > $ cd trusted-firmware-a > $ export CROSS_COMPILE=aarch64-linux-gnu- > $ export IMX_BOOT_UART_BASE=0x30860000 > - $ # with optee > - $ make PLAT=imx8mp SPD=opteed bl31 > - $ # without optee > - $ make PLAT=imx8mp bl31 > + $ make PLAT=imx8mp BL32_BASE=0x7e000000 SPD=opteed bl31 > > -Build the OP-TEE binary (optional) > ----------------------------------- > +Build the OP-TEE binary > +----------------------- > > .. code-block:: bash > > @@ -39,7 +36,7 @@ Build the OP-TEE binary (optional) > CROSS_COMPILE=aarch64-linux-gnu- \ > O=out/arm \ > PLATFORM=imx-mx8mp_phyboard_pollux \ > - CFG_TZDRAM_START=0x56000000 > + CFG_TZDRAM_START=0x7e000000 > > Get the ddr firmware > -------------------- > -- PHYTEC Messtechnik GmbH | Barcelona-Allee 1 | 55129 Mainz, Germany Geschäftsführer: Dipl.-Ing. Michael Mitezki, Dipl.-Ing. Bodo Huber, Dipl.-Ing. (FH) Markus Lickes | Handelsregister Mainz HRB 4656 | Finanzamt Mainz | St.Nr. 26/665/00608, DE 149059855