mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 10:04:26 +00:00
Merge changes I6b4a4d22,I06bde289,I86e39481,I7ea9b75c into integration
* changes: feat(stm32mp1-fdts): use /omit-if-no-ref/ for pins nodes feat(st): mandate dtc version 1.4.7 refactor(st): move mbedtls config files refactor(st): add common mk files
This commit is contained in:
Madhukar Pappireddy
TrustedFirmware Code Review
commit
90a93cb7e0
10 changed files with 396 additions and 380 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2022 - All Rights Reserved
|
||||
* Copyright (c) 2022-2023, STMicroelectronics - All Rights Reserved
|
||||
*/
|
||||
|
||||
/ {
|
||||
|
|
@ -32,13 +32,6 @@
|
|||
#if !STM32MP_USB_PROGRAMMER
|
||||
/delete-node/ usbphyc@5a006000;
|
||||
#endif
|
||||
|
||||
pinctrl@50002000 {
|
||||
#if !STM32MP_EMMC && !STM32MP_SDMMC
|
||||
/delete-node/ sdmmc1-b4-0;
|
||||
/delete-node/ sdmmc2-b4-0;
|
||||
#endif
|
||||
};
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2022 - All Rights Reserved
|
||||
* Copyright (c) 2022-2023, STMicroelectronics - All Rights Reserved
|
||||
* Author: Alexandre Torgue <alexandre.torgue@foss.st.com>
|
||||
*/
|
||||
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
|
||||
|
||||
&pinctrl {
|
||||
i2c4_pins_a: i2c4-0 {
|
||||
/omit-if-no-ref/ i2c4_pins_a: i2c4-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('E', 15, AF6)>, /* I2C4_SCL */
|
||||
<STM32_PINMUX('B', 9, AF6)>; /* I2C4_SDA */
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc1_b4_pins_a: sdmmc1-b4-0 {
|
||||
/omit-if-no-ref/ sdmmc1_b4_pins_a: sdmmc1-b4-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
|
||||
<STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc1_clk_pins_a: sdmmc1-clk-0 {
|
||||
/omit-if-no-ref/ sdmmc1_clk_pins_a: sdmmc1-clk-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('C', 12, AF12)>; /* SDMMC1_CK */
|
||||
slew-rate = <1>;
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_b4_pins_a: sdmmc2-b4-0 {
|
||||
/omit-if-no-ref/ sdmmc2_b4_pins_a: sdmmc2-b4-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('B', 14, AF10)>, /* SDMMC2_D0 */
|
||||
<STM32_PINMUX('B', 15, AF10)>, /* SDMMC2_D1 */
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_clk_pins_a: sdmmc2-clk-0 {
|
||||
/omit-if-no-ref/ sdmmc2_clk_pins_a: sdmmc2-clk-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('E', 3, AF10)>; /* SDMMC2_CK */
|
||||
slew-rate = <1>;
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart4_pins_a: uart4-0 {
|
||||
/omit-if-no-ref/ uart4_pins_a: uart4-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('D', 6, AF8)>; /* UART4_TX */
|
||||
bias-disable;
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
usart1_pins_a: usart1-0 {
|
||||
/omit-if-no-ref/ usart1_pins_a: usart1-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('C', 0, AF7)>, /* USART1_TX */
|
||||
<STM32_PINMUX('C', 2, AF7)>; /* USART1_RTS */
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart8_pins_a: uart8-0 {
|
||||
/omit-if-no-ref/ uart8_pins_a: uart8-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('E', 1, AF8)>; /* UART8_TX */
|
||||
bias-disable;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2020-2022 - All Rights Reserved
|
||||
* Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved
|
||||
*/
|
||||
|
||||
/ {
|
||||
|
|
@ -45,28 +45,6 @@
|
|||
/delete-node/ stgen@5c008000;
|
||||
/delete-node/ i2c@5c009000;
|
||||
/delete-node/ tamp@5c00a000;
|
||||
|
||||
pinctrl@50002000 {
|
||||
#if !STM32MP_RAW_NAND
|
||||
/delete-node/ fmc-0;
|
||||
#endif
|
||||
#if !STM32MP_SPI_NAND && !STM32MP_SPI_NOR
|
||||
/delete-node/ qspi-clk-0;
|
||||
/delete-node/ qspi-bk1-0;
|
||||
/delete-node/ qspi-bk2-0;
|
||||
#endif
|
||||
#if !STM32MP_EMMC && !STM32MP_SDMMC
|
||||
/delete-node/ sdmmc1-b4-0;
|
||||
/delete-node/ sdmmc1-dir-0;
|
||||
/delete-node/ sdmmc2-b4-0;
|
||||
/delete-node/ sdmmc2-b4-1;
|
||||
/delete-node/ sdmmc2-d47-0;
|
||||
#endif
|
||||
#if !STM32MP_USB_PROGRAMMER
|
||||
/delete-node/ usbotg_hs-0;
|
||||
/delete-node/ usbotg-fs-dp-dm-0;
|
||||
#endif
|
||||
};
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2020-2021 - All Rights Reserved
|
||||
* Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved
|
||||
*/
|
||||
|
||||
/ {
|
||||
|
|
@ -26,21 +26,5 @@
|
|||
/delete-node/ spi@5c001000;
|
||||
/delete-node/ stgen@5c008000;
|
||||
/delete-node/ i2c@5c009000;
|
||||
|
||||
pinctrl@50002000 {
|
||||
/delete-node/ fmc-0;
|
||||
/delete-node/ qspi-clk-0;
|
||||
/delete-node/ qspi-bk1-0;
|
||||
/delete-node/ qspi-bk2-0;
|
||||
/delete-node/ sdmmc1-b4-0;
|
||||
/delete-node/ sdmmc1-dir-0;
|
||||
/delete-node/ sdmmc2-b4-0;
|
||||
/delete-node/ sdmmc2-b4-1;
|
||||
/delete-node/ sdmmc2-d47-0;
|
||||
/delete-node/ sdmmc2-d47-1;
|
||||
/delete-node/ sdmmc2-d47-3;
|
||||
/delete-node/ usbotg_hs-0;
|
||||
/delete-node/ usbotg-fs-dp-dm-0;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
|
||||
/*
|
||||
* Copyright (c) 2017-2021, STMicroelectronics - All Rights Reserved
|
||||
* Copyright (c) 2017-2023, STMicroelectronics - All Rights Reserved
|
||||
* Author: Ludovic Barre <ludovic.barre@st.com> for STMicroelectronics.
|
||||
*/
|
||||
#include <dt-bindings/pinctrl/stm32-pinfunc.h>
|
||||
|
||||
&pinctrl {
|
||||
fmc_pins_a: fmc-0 {
|
||||
/omit-if-no-ref/ fmc_pins_a: fmc-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('D', 4, AF12)>, /* FMC_NOE */
|
||||
<STM32_PINMUX('D', 5, AF12)>, /* FMC_NWE */
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
i2c2_pins_a: i2c2-0 {
|
||||
/omit-if-no-ref/ i2c2_pins_a: i2c2-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('H', 4, AF4)>, /* I2C2_SCL */
|
||||
<STM32_PINMUX('H', 5, AF4)>; /* I2C2_SDA */
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
qspi_clk_pins_a: qspi-clk-0 {
|
||||
/omit-if-no-ref/ qspi_clk_pins_a: qspi-clk-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('F', 10, AF9)>; /* QSPI_CLK */
|
||||
bias-disable;
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
qspi_bk1_pins_a: qspi-bk1-0 {
|
||||
/omit-if-no-ref/ qspi_bk1_pins_a: qspi-bk1-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('F', 8, AF10)>, /* QSPI_BK1_IO0 */
|
||||
<STM32_PINMUX('F', 9, AF10)>, /* QSPI_BK1_IO1 */
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
qspi_bk2_pins_a: qspi-bk2-0 {
|
||||
/omit-if-no-ref/ qspi_bk2_pins_a: qspi-bk2-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('H', 2, AF9)>, /* QSPI_BK2_IO0 */
|
||||
<STM32_PINMUX('H', 3, AF9)>, /* QSPI_BK2_IO1 */
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc1_b4_pins_a: sdmmc1-b4-0 {
|
||||
/omit-if-no-ref/ sdmmc1_b4_pins_a: sdmmc1-b4-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */
|
||||
<STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc1_dir_pins_a: sdmmc1-dir-0 {
|
||||
/omit-if-no-ref/ sdmmc1_dir_pins_a: sdmmc1-dir-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('F', 2, AF11)>, /* SDMMC1_D0DIR */
|
||||
<STM32_PINMUX('C', 7, AF8)>, /* SDMMC1_D123DIR */
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc1_dir_pins_b: sdmmc1-dir-1 {
|
||||
/omit-if-no-ref/ sdmmc1_dir_pins_b: sdmmc1-dir-1 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('F', 2, AF11)>, /* SDMMC1_D0DIR */
|
||||
<STM32_PINMUX('E', 14, AF11)>, /* SDMMC1_D123DIR */
|
||||
|
|
@ -135,7 +135,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_b4_pins_a: sdmmc2-b4-0 {
|
||||
/omit-if-no-ref/ sdmmc2_b4_pins_a: sdmmc2-b4-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('B', 14, AF9)>, /* SDMMC2_D0 */
|
||||
<STM32_PINMUX('B', 15, AF9)>, /* SDMMC2_D1 */
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_b4_pins_b: sdmmc2-b4-1 {
|
||||
/omit-if-no-ref/ sdmmc2_b4_pins_b: sdmmc2-b4-1 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('B', 14, AF9)>, /* SDMMC2_D0 */
|
||||
<STM32_PINMUX('B', 15, AF9)>, /* SDMMC2_D1 */
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_d47_pins_a: sdmmc2-d47-0 {
|
||||
/omit-if-no-ref/ sdmmc2_d47_pins_a: sdmmc2-d47-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
|
||||
<STM32_PINMUX('A', 9, AF10)>, /* SDMMC2_D5 */
|
||||
|
|
@ -185,7 +185,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_d47_pins_b: sdmmc2-d47-1 {
|
||||
/omit-if-no-ref/ sdmmc2_d47_pins_b: sdmmc2-d47-1 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
|
||||
<STM32_PINMUX('A', 9, AF10)>, /* SDMMC2_D5 */
|
||||
|
|
@ -197,7 +197,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_d47_pins_c: sdmmc2-d47-2 {
|
||||
/omit-if-no-ref/ sdmmc2_d47_pins_c: sdmmc2-d47-2 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
|
||||
<STM32_PINMUX('A', 15, AF9)>, /* SDMMC2_D5 */
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
sdmmc2_d47_pins_d: sdmmc2-d47-3 {
|
||||
/omit-if-no-ref/ sdmmc2_d47_pins_d: sdmmc2-d47-3 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('A', 8, AF9)>, /* SDMMC2_D4 */
|
||||
<STM32_PINMUX('A', 9, AF10)>, /* SDMMC2_D5 */
|
||||
|
|
@ -218,7 +218,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart4_pins_a: uart4-0 {
|
||||
/omit-if-no-ref/ uart4_pins_a: uart4-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */
|
||||
bias-disable;
|
||||
|
|
@ -231,7 +231,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart4_pins_b: uart4-1 {
|
||||
/omit-if-no-ref/ uart4_pins_b: uart4-1 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('D', 1, AF8)>; /* UART4_TX */
|
||||
bias-disable;
|
||||
|
|
@ -244,7 +244,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart7_pins_a: uart7-0 {
|
||||
/omit-if-no-ref/ uart7_pins_a: uart7-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('E', 8, AF7)>; /* UART7_TX */
|
||||
bias-disable;
|
||||
|
|
@ -259,7 +259,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart7_pins_b: uart7-1 {
|
||||
/omit-if-no-ref/ uart7_pins_b: uart7-1 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('F', 7, AF7)>; /* UART7_TX */
|
||||
bias-disable;
|
||||
|
|
@ -272,7 +272,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart7_pins_c: uart7-2 {
|
||||
/omit-if-no-ref/ uart7_pins_c: uart7-2 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('E', 8, AF7)>; /* UART7_TX */
|
||||
bias-disable;
|
||||
|
|
@ -285,7 +285,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
uart8_pins_a: uart8-0 {
|
||||
/omit-if-no-ref/ uart8_pins_a: uart8-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('E', 1, AF8)>; /* UART8_TX */
|
||||
bias-disable;
|
||||
|
|
@ -298,7 +298,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
usart2_pins_a: usart2-0 {
|
||||
/omit-if-no-ref/ usart2_pins_a: usart2-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
|
||||
<STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */
|
||||
|
|
@ -313,7 +313,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
usart2_pins_b: usart2-1 {
|
||||
/omit-if-no-ref/ usart2_pins_b: usart2-1 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
|
||||
<STM32_PINMUX('A', 1, AF7)>; /* USART2_RTS */
|
||||
|
|
@ -328,7 +328,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
usart2_pins_c: usart2-2 {
|
||||
/omit-if-no-ref/ usart2_pins_c: usart2-2 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('D', 5, AF7)>, /* USART2_TX */
|
||||
<STM32_PINMUX('D', 4, AF7)>; /* USART2_RTS */
|
||||
|
|
@ -343,7 +343,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
usart3_pins_a: usart3-0 {
|
||||
/omit-if-no-ref/ usart3_pins_a: usart3-0 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('B', 10, AF7)>; /* USART3_TX */
|
||||
bias-disable;
|
||||
|
|
@ -356,7 +356,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
usart3_pins_b: usart3-1 {
|
||||
/omit-if-no-ref/ usart3_pins_b: usart3-1 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */
|
||||
<STM32_PINMUX('G', 8, AF8)>; /* USART3_RTS */
|
||||
|
|
@ -371,7 +371,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
usart3_pins_c: usart3-2 {
|
||||
/omit-if-no-ref/ usart3_pins_c: usart3-2 {
|
||||
pins1 {
|
||||
pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */
|
||||
<STM32_PINMUX('G', 8, AF8)>; /* USART3_RTS */
|
||||
|
|
@ -386,13 +386,13 @@
|
|||
};
|
||||
};
|
||||
|
||||
usbotg_hs_pins_a: usbotg-hs-0 {
|
||||
/omit-if-no-ref/ usbotg_hs_pins_a: usbotg-hs-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('A', 10, ANALOG)>; /* OTG_ID */
|
||||
};
|
||||
};
|
||||
|
||||
usbotg_fs_dp_dm_pins_a: usbotg-fs-dp-dm-0 {
|
||||
/omit-if-no-ref/ usbotg_fs_dp_dm_pins_a: usbotg-fs-dp-dm-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('A', 11, ANALOG)>, /* OTG_FS_DM */
|
||||
<STM32_PINMUX('A', 12, ANALOG)>; /* OTG_FS_DP */
|
||||
|
|
@ -401,7 +401,7 @@
|
|||
};
|
||||
|
||||
&pinctrl_z {
|
||||
i2c4_pins_a: i2c4-0 {
|
||||
/omit-if-no-ref/ i2c4_pins_a: i2c4-0 {
|
||||
pins {
|
||||
pinmux = <STM32_PINMUX('Z', 4, AF6)>, /* I2C4_SCL */
|
||||
<STM32_PINMUX('Z', 5, AF6)>; /* I2C4_SDA */
|
||||
|
|
|
|||
257
plat/st/common/common.mk
Normal file
257
plat/st/common/common.mk
Normal file
|
|
@ -0,0 +1,257 @@
|
|||
#
|
||||
# Copyright (c) 2023, STMicroelectronics - All Rights Reserved
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
RESET_TO_BL2 := 1
|
||||
|
||||
STM32MP_EARLY_CONSOLE ?= 0
|
||||
STM32MP_RECONFIGURE_CONSOLE ?= 0
|
||||
STM32MP_UART_BAUDRATE ?= 115200
|
||||
|
||||
TRUSTED_BOARD_BOOT ?= 0
|
||||
STM32MP_USE_EXTERNAL_HEAP ?= 0
|
||||
|
||||
# Use secure library from the ROM code for authentication
|
||||
STM32MP_CRYPTO_ROM_LIB ?= 0
|
||||
|
||||
# Please don't increment this value without good understanding of
|
||||
# the monotonic counter
|
||||
STM32_TF_VERSION ?= 0
|
||||
|
||||
# Enable dynamic memory mapping
|
||||
PLAT_XLAT_TABLES_DYNAMIC := 1
|
||||
|
||||
# STM32 image header binary type for BL2
|
||||
STM32_HEADER_BL2_BINARY_TYPE := 0x10
|
||||
|
||||
TF_CFLAGS += -Wsign-compare
|
||||
TF_CFLAGS += -Wformat-signedness
|
||||
|
||||
# Boot devices
|
||||
STM32MP_EMMC ?= 0
|
||||
STM32MP_SDMMC ?= 0
|
||||
STM32MP_RAW_NAND ?= 0
|
||||
STM32MP_SPI_NAND ?= 0
|
||||
STM32MP_SPI_NOR ?= 0
|
||||
|
||||
# Put both BL2 and FIP in eMMC boot partition
|
||||
STM32MP_EMMC_BOOT ?= 0
|
||||
|
||||
# Serial boot devices
|
||||
STM32MP_UART_PROGRAMMER ?= 0
|
||||
STM32MP_USB_PROGRAMMER ?= 0
|
||||
|
||||
$(eval DTC_V = $(shell $(DTC) -v | awk '{print $$NF}'))
|
||||
$(eval DTC_VERSION = $(shell printf "%d" $(shell echo ${DTC_V} | cut -d- -f1 | sed "s/\./0/g" | grep -o "[0-9]*")))
|
||||
DTC_CPPFLAGS += ${INCLUDES}
|
||||
DTC_FLAGS += -Wno-unit_address_vs_reg
|
||||
ifeq ($(shell test $(DTC_VERSION) -ge 10601; echo $$?),0)
|
||||
DTC_FLAGS += -Wno-interrupt_provider
|
||||
endif
|
||||
|
||||
# Macros and rules to build TF binary
|
||||
STM32_TF_ELF_LDFLAGS := --hash-style=gnu --as-needed
|
||||
STM32_TF_LINKERFILE := ${BUILD_PLAT}/${PLAT}.ld
|
||||
|
||||
ASFLAGS += -DBL2_BIN_PATH=\"${BUILD_PLAT}/bl2.bin\"
|
||||
|
||||
# Variables for use with stm32image
|
||||
STM32IMAGEPATH ?= tools/stm32image
|
||||
STM32IMAGE ?= ${STM32IMAGEPATH}/stm32image${BIN_EXT}
|
||||
STM32IMAGE_SRC := ${STM32IMAGEPATH}/stm32image.c
|
||||
STM32_DEPS += ${STM32IMAGE}
|
||||
|
||||
FIP_DEPS += dtbs
|
||||
STM32MP_HW_CONFIG := ${BL33_CFG}
|
||||
|
||||
# Add the HW_CONFIG to FIP and specify the same to certtool
|
||||
$(eval $(call TOOL_ADD_PAYLOAD,${STM32MP_HW_CONFIG},--hw-config))
|
||||
|
||||
# Add the build options to pack Trusted OS Extra1 and Trusted OS Extra2 images
|
||||
# in the FIP if the platform requires.
|
||||
ifneq ($(BL32_EXTRA1),)
|
||||
$(eval $(call TOOL_ADD_IMG,BL32_EXTRA1,--tos-fw-extra1,,$(ENCRYPT_BL32)))
|
||||
endif
|
||||
ifneq ($(BL32_EXTRA2),)
|
||||
$(eval $(call TOOL_ADD_IMG,BL32_EXTRA2,--tos-fw-extra2,,$(ENCRYPT_BL32)))
|
||||
endif
|
||||
|
||||
# Enable flags for C files
|
||||
$(eval $(call assert_booleans,\
|
||||
$(sort \
|
||||
PLAT_XLAT_TABLES_DYNAMIC \
|
||||
STM32MP_EARLY_CONSOLE \
|
||||
STM32MP_EMMC \
|
||||
STM32MP_EMMC_BOOT \
|
||||
STM32MP_RAW_NAND \
|
||||
STM32MP_RECONFIGURE_CONSOLE \
|
||||
STM32MP_SDMMC \
|
||||
STM32MP_SPI_NAND \
|
||||
STM32MP_SPI_NOR \
|
||||
STM32MP_UART_PROGRAMMER \
|
||||
STM32MP_USB_PROGRAMMER \
|
||||
)))
|
||||
|
||||
$(eval $(call assert_numerics,\
|
||||
$(sort \
|
||||
STM32_TF_VERSION \
|
||||
STM32MP_UART_BAUDRATE \
|
||||
)))
|
||||
|
||||
$(eval $(call add_defines,\
|
||||
$(sort \
|
||||
PLAT_XLAT_TABLES_DYNAMIC \
|
||||
STM32_TF_VERSION \
|
||||
STM32MP_EARLY_CONSOLE \
|
||||
STM32MP_EMMC \
|
||||
STM32MP_EMMC_BOOT \
|
||||
STM32MP_RAW_NAND \
|
||||
STM32MP_RECONFIGURE_CONSOLE \
|
||||
STM32MP_SDMMC \
|
||||
STM32MP_SPI_NAND \
|
||||
STM32MP_SPI_NOR \
|
||||
STM32MP_UART_BAUDRATE \
|
||||
STM32MP_UART_PROGRAMMER \
|
||||
STM32MP_USB_PROGRAMMER \
|
||||
)))
|
||||
|
||||
# Include paths and source files
|
||||
PLAT_INCLUDES += -Iplat/st/common/include/
|
||||
|
||||
include lib/fconf/fconf.mk
|
||||
include lib/libfdt/libfdt.mk
|
||||
include lib/zlib/zlib.mk
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += common/uuid.c \
|
||||
plat/st/common/stm32mp_common.c
|
||||
|
||||
|
||||
include lib/xlat_tables_v2/xlat_tables.mk
|
||||
PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS}
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += drivers/clk/clk.c \
|
||||
drivers/delay_timer/delay_timer.c \
|
||||
drivers/delay_timer/generic_delay_timer.c \
|
||||
drivers/st/clk/stm32mp_clkfunc.c \
|
||||
drivers/st/ddr/stm32mp_ddr.c \
|
||||
drivers/st/gpio/stm32_gpio.c \
|
||||
drivers/st/regulator/regulator_core.c \
|
||||
drivers/st/regulator/regulator_fixed.c \
|
||||
plat/st/common/stm32mp_dt.c
|
||||
|
||||
BL2_SOURCES += ${FCONF_SOURCES} ${FCONF_DYN_SOURCES}
|
||||
BL2_SOURCES += $(ZLIB_SOURCES)
|
||||
|
||||
BL2_SOURCES += drivers/io/io_fip.c \
|
||||
plat/st/common/bl2_io_storage.c \
|
||||
plat/st/common/stm32mp_fconf_io.c
|
||||
|
||||
BL2_SOURCES += drivers/io/io_block.c \
|
||||
drivers/io/io_mtd.c \
|
||||
drivers/io/io_storage.c
|
||||
|
||||
ifneq (${DECRYPTION_SUPPORT},none)
|
||||
BL2_SOURCES += drivers/io/io_encrypted.c
|
||||
endif
|
||||
|
||||
ifeq (${TRUSTED_BOARD_BOOT},1)
|
||||
AUTH_SOURCES := drivers/auth/auth_mod.c \
|
||||
drivers/auth/crypto_mod.c \
|
||||
drivers/auth/img_parser_mod.c
|
||||
|
||||
ifeq (${GENERATE_COT},1)
|
||||
TFW_NVCTR_VAL := 0
|
||||
NTFW_NVCTR_VAL := 0
|
||||
KEY_SIZE :=
|
||||
KEY_ALG := ecdsa
|
||||
HASH_ALG := sha256
|
||||
|
||||
ifeq (${SAVE_KEYS},1)
|
||||
TRUSTED_WORLD_KEY ?= ${BUILD_PLAT}/trusted.pem
|
||||
NON_TRUSTED_WORLD_KEY ?= ${BUILD_PLAT}/non-trusted.pem
|
||||
BL32_KEY ?= ${BUILD_PLAT}/trusted_os.pem
|
||||
BL33_KEY ?= ${BUILD_PLAT}/non-trusted_os.pem
|
||||
endif
|
||||
|
||||
endif
|
||||
TF_MBEDTLS_KEY_ALG := ecdsa
|
||||
|
||||
ifneq (${MBEDTLS_DIR},)
|
||||
MBEDTLS_MAJOR=$(shell grep -hP "define MBEDTLS_VERSION_MAJOR" \
|
||||
${MBEDTLS_DIR}/include/mbedtls/*.h | grep -oe '\([0-9.]*\)')
|
||||
|
||||
ifeq (${MBEDTLS_MAJOR}, 2)
|
||||
MBEDTLS_CONFIG_FILE ?= "<stm32mp_mbedtls_config-2.h>"
|
||||
endif
|
||||
|
||||
ifeq (${MBEDTLS_MAJOR}, 3)
|
||||
MBEDTLS_CONFIG_FILE ?= "<stm32mp_mbedtls_config-3.h>"
|
||||
endif
|
||||
endif
|
||||
|
||||
include drivers/auth/mbedtls/mbedtls_x509.mk
|
||||
|
||||
COT_DESC_IN_DTB := 1
|
||||
AUTH_SOURCES += lib/fconf/fconf_cot_getter.c \
|
||||
lib/fconf/fconf_tbbr_getter.c \
|
||||
plat/st/common/stm32mp_crypto_lib.c
|
||||
|
||||
BL2_SOURCES += $(AUTH_SOURCES) \
|
||||
plat/st/common/stm32mp_trusted_boot.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_EMMC} ${STM32MP_SDMMC}),)
|
||||
BL2_SOURCES += drivers/mmc/mmc.c \
|
||||
drivers/partition/gpt.c \
|
||||
drivers/partition/partition.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_SPI_NAND} ${STM32MP_SPI_NOR}),)
|
||||
BL2_SOURCES += drivers/mtd/spi-mem/spi_mem.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_RAW_NAND},1)
|
||||
$(eval $(call add_define_val,NAND_ONFI_DETECT,1))
|
||||
BL2_SOURCES += drivers/mtd/nand/raw_nand.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_SPI_NAND},1)
|
||||
BL2_SOURCES += drivers/mtd/nand/spi_nand.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_SPI_NOR},1)
|
||||
ifneq (${STM32MP_FORCE_MTD_START_OFFSET},)
|
||||
$(eval $(call add_define_val,STM32MP_NOR_FIP_OFFSET,${STM32MP_FORCE_MTD_START_OFFSET}))
|
||||
endif
|
||||
BL2_SOURCES += drivers/mtd/nor/spi_nor.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_RAW_NAND} ${STM32MP_SPI_NAND}),)
|
||||
ifneq (${STM32MP_FORCE_MTD_START_OFFSET},)
|
||||
$(eval $(call add_define_val,STM32MP_NAND_FIP_OFFSET,${STM32MP_FORCE_MTD_START_OFFSET}))
|
||||
endif
|
||||
BL2_SOURCES += drivers/mtd/nand/core.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_UART_PROGRAMMER} ${STM32MP_USB_PROGRAMMER}),)
|
||||
BL2_SOURCES += drivers/io/io_memmap.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_UART_PROGRAMMER},1)
|
||||
BL2_SOURCES += plat/st/common/stm32cubeprogrammer_uart.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_USB_PROGRAMMER},1)
|
||||
BL2_SOURCES += drivers/usb/usb_device.c \
|
||||
plat/st/common/stm32cubeprogrammer_usb.c \
|
||||
plat/st/common/usb_dfu.c
|
||||
endif
|
||||
|
||||
BL2_SOURCES += drivers/st/ddr/stm32mp_ddr_test.c \
|
||||
drivers/st/ddr/stm32mp_ram.c
|
||||
|
||||
BL2_SOURCES += common/desc_image_load.c
|
||||
|
||||
BL2_SOURCES += lib/optee/optee_utils.c
|
||||
79
plat/st/common/common_rules.mk
Normal file
79
plat/st/common/common_rules.mk
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
#
|
||||
# Copyright (c) 2023, STMicroelectronics - All Rights Reserved
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
# Compilation rules
|
||||
.PHONY: check_dtc_version stm32image clean_stm32image check_boot_device
|
||||
.SUFFIXES:
|
||||
|
||||
all: check_dtc_version stm32image ${STM32_TF_STM32}
|
||||
|
||||
distclean realclean clean: clean_stm32image
|
||||
|
||||
bl2: check_boot_device
|
||||
|
||||
check_boot_device:
|
||||
@if [ ${STM32MP_EMMC} != 1 ] && \
|
||||
[ ${STM32MP_SDMMC} != 1 ] && \
|
||||
[ ${STM32MP_RAW_NAND} != 1 ] && \
|
||||
[ ${STM32MP_SPI_NAND} != 1 ] && \
|
||||
[ ${STM32MP_SPI_NOR} != 1 ] && \
|
||||
[ ${STM32MP_UART_PROGRAMMER} != 1 ] && \
|
||||
[ ${STM32MP_USB_PROGRAMMER} != 1 ]; then \
|
||||
echo "No boot device driver is enabled"; \
|
||||
false; \
|
||||
fi
|
||||
|
||||
stm32image: ${STM32IMAGE}
|
||||
|
||||
${STM32IMAGE}: ${STM32IMAGE_SRC}
|
||||
${Q}${MAKE} CPPFLAGS="" --no-print-directory -C ${STM32IMAGEPATH}
|
||||
|
||||
clean_stm32image:
|
||||
${Q}${MAKE} --no-print-directory -C ${STM32IMAGEPATH} clean
|
||||
|
||||
check_dtc_version:
|
||||
@if [ ${DTC_VERSION} -lt 10407 ]; then \
|
||||
echo "dtc version too old (${DTC_V}), you need at least version 1.4.7"; \
|
||||
false; \
|
||||
fi
|
||||
|
||||
# Create DTB file for BL2
|
||||
${BUILD_PLAT}/fdts/%-bl2.dts: fdts/%.dts fdts/${BL2_DTSI} | ${BUILD_PLAT} fdt_dirs
|
||||
@echo '#include "$(patsubst fdts/%,%,$<)"' > $@
|
||||
@echo '#include "${BL2_DTSI}"' >> $@
|
||||
|
||||
${BUILD_PLAT}/fdts/%-bl2.dtb: ${BUILD_PLAT}/fdts/%-bl2.dts
|
||||
|
||||
${BUILD_PLAT}/$(PLAT)-%.o: ${BUILD_PLAT}/fdts/%-bl2.dtb $(STM32_BINARY_MAPPING) bl2
|
||||
@echo " AS $${PLAT}.S"
|
||||
${Q}${AS} ${ASFLAGS} ${TF_CFLAGS} \
|
||||
-DDTB_BIN_PATH=\"$<\" \
|
||||
-c $(word 2,$^) -o $@
|
||||
|
||||
$(eval $(call MAKE_LD,${STM32_TF_LINKERFILE},$(STM32_LD_FILE),bl2))
|
||||
|
||||
tf-a-%.elf: $(PLAT)-%.o ${STM32_TF_LINKERFILE}
|
||||
@echo " LDS $<"
|
||||
${Q}${LD} -o $@ ${STM32_TF_ELF_LDFLAGS} -Map=$(@:.elf=.map) --script ${STM32_TF_LINKERFILE} $<
|
||||
|
||||
tf-a-%.bin: tf-a-%.elf
|
||||
${Q}${OC} -O binary $< $@
|
||||
@echo
|
||||
@echo "Built $@ successfully"
|
||||
@echo
|
||||
|
||||
tf-a-%.stm32: tf-a-%.bin ${STM32_DEPS}
|
||||
@echo
|
||||
@echo "Generate $@"
|
||||
$(eval LOADADDR = $(shell cat $(@:.stm32=.map) | grep RAM | awk '{print $$2}'))
|
||||
$(eval ENTRY = $(shell cat $(@:.stm32=.map) | grep "__BL2_IMAGE_START" | awk '{print $$1}'))
|
||||
${Q}${STM32IMAGE} -s $< -d $@ \
|
||||
-l $(LOADADDR) -e ${ENTRY} \
|
||||
-v ${STM32_TF_VERSION} \
|
||||
-m ${STM32_HEADER_VERSION_MAJOR} \
|
||||
-n ${STM32_HEADER_VERSION_MINOR} \
|
||||
-b ${STM32_HEADER_BL2_BINARY_TYPE}
|
||||
@echo
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2022, STMicroelectronics - All Rights Reserved
|
||||
* Copyright (c) 2022-2023, STMicroelectronics - All Rights Reserved
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2022, STMicroelectronics - All Rights Reserved
|
||||
* Copyright (c) 2022-2023, STMicroelectronics - All Rights Reserved
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -4,28 +4,12 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
include plat/st/common/common.mk
|
||||
|
||||
ARM_CORTEX_A7 := yes
|
||||
ARM_WITH_NEON := yes
|
||||
RESET_TO_BL2 := 1
|
||||
USE_COHERENT_MEM := 0
|
||||
|
||||
STM32MP_EARLY_CONSOLE ?= 0
|
||||
STM32MP_RECONFIGURE_CONSOLE ?= 0
|
||||
STM32MP_UART_BAUDRATE ?= 115200
|
||||
|
||||
TRUSTED_BOARD_BOOT ?= 0
|
||||
STM32MP_USE_EXTERNAL_HEAP ?= 0
|
||||
|
||||
# Use secure library from the ROM code for authentication
|
||||
STM32MP_CRYPTO_ROM_LIB ?= 0
|
||||
|
||||
# Please don't increment this value without good understanding of
|
||||
# the monotonic counter
|
||||
STM32_TF_VERSION ?= 0
|
||||
|
||||
# Enable dynamic memory mapping
|
||||
PLAT_XLAT_TABLES_DYNAMIC := 1
|
||||
|
||||
# Default Device tree
|
||||
DTB_FILE_NAME ?= stm32mp157c-ev1.dtb
|
||||
|
||||
|
|
@ -89,17 +73,11 @@ $(error "DECRYPTION_SUPPORT not supported on STM32MP15")
|
|||
endif
|
||||
endif
|
||||
|
||||
# STM32 image header binary type for BL2
|
||||
STM32_HEADER_BL2_BINARY_TYPE:= 0x10
|
||||
|
||||
ifeq ($(AARCH32_SP),sp_min)
|
||||
# Disable Neon support: sp_min runtime may conflict with non-secure world
|
||||
TF_CFLAGS += -mfloat-abi=soft
|
||||
endif
|
||||
|
||||
TF_CFLAGS += -Wsign-compare
|
||||
TF_CFLAGS += -Wformat-signedness
|
||||
|
||||
# Not needed for Cortex-A7
|
||||
WORKAROUND_CVE_2017_5715:= 0
|
||||
WORKAROUND_CVE_2022_23960:= 0
|
||||
|
|
@ -131,18 +109,6 @@ STM32_HASH_VER := 2
|
|||
STM32_RNG_VER := 2
|
||||
endif
|
||||
|
||||
# Boot devices
|
||||
STM32MP_EMMC ?= 0
|
||||
STM32MP_SDMMC ?= 0
|
||||
STM32MP_RAW_NAND ?= 0
|
||||
STM32MP_SPI_NAND ?= 0
|
||||
STM32MP_SPI_NOR ?= 0
|
||||
STM32MP_EMMC_BOOT ?= 0
|
||||
|
||||
# Serial boot devices
|
||||
STM32MP_USB_PROGRAMMER ?= 0
|
||||
STM32MP_UART_PROGRAMMER ?= 0
|
||||
|
||||
# Download load address for serial boot devices
|
||||
DWL_BUFFER_BASE ?= 0xC7000000
|
||||
|
||||
|
|
@ -159,33 +125,17 @@ FDT_SOURCES += $(addprefix ${BUILD_PLAT}/fdts/, $(patsubst %.dtb,%-bl32.dts,$(D
|
|||
endif
|
||||
endif
|
||||
|
||||
$(eval DTC_V = $(shell $(DTC) -v | awk '{print $$NF}'))
|
||||
$(eval DTC_VERSION = $(shell printf "%d" $(shell echo ${DTC_V} | cut -d- -f1 | sed "s/\./0/g" | grep -o "[0-9]*")))
|
||||
DTC_CPPFLAGS += ${INCLUDES}
|
||||
DTC_FLAGS += -Wno-unit_address_vs_reg
|
||||
ifeq ($(shell test $(DTC_VERSION) -ge 10601; echo $$?),0)
|
||||
DTC_FLAGS += -Wno-interrupt_provider
|
||||
endif
|
||||
|
||||
# Macros and rules to build TF binary
|
||||
STM32_TF_ELF_LDFLAGS := --hash-style=gnu --as-needed
|
||||
STM32_TF_STM32 := $(addprefix ${BUILD_PLAT}/tf-a-, $(patsubst %.dtb,%.stm32,$(DTB_FILE_NAME)))
|
||||
STM32_TF_LINKERFILE := ${BUILD_PLAT}/stm32mp1.ld
|
||||
STM32_LD_FILE := plat/st/stm32mp1/stm32mp1.ld.S
|
||||
STM32_BINARY_MAPPING := plat/st/stm32mp1/stm32mp1.S
|
||||
|
||||
ASFLAGS += -DBL2_BIN_PATH=\"${BUILD_PLAT}/bl2.bin\"
|
||||
ifeq ($(AARCH32_SP),sp_min)
|
||||
# BL32 is built only if using SP_MIN
|
||||
BL32_DEP := bl32
|
||||
ASFLAGS += -DBL32_BIN_PATH=\"${BUILD_PLAT}/bl32.bin\"
|
||||
endif
|
||||
|
||||
# Variables for use with stm32image
|
||||
STM32IMAGEPATH ?= tools/stm32image
|
||||
STM32IMAGE ?= ${STM32IMAGEPATH}/stm32image${BIN_EXT}
|
||||
STM32IMAGE_SRC := ${STM32IMAGEPATH}/stm32image.c
|
||||
|
||||
FIP_DEPS += dtbs
|
||||
STM32MP_HW_CONFIG := ${BL33_CFG}
|
||||
STM32MP_FW_CONFIG_NAME := $(patsubst %.dtb,%-fw-config.dtb,$(DTB_FILE_NAME))
|
||||
STM32MP_FW_CONFIG := ${BUILD_PLAT}/fdts/$(STM32MP_FW_CONFIG_NAME)
|
||||
ifneq (${AARCH32_SP},none)
|
||||
|
|
@ -193,8 +143,6 @@ FDT_SOURCES += $(addprefix fdts/, $(patsubst %.dtb,%.dts,$(STM32MP_FW_CONFIG_NA
|
|||
endif
|
||||
# Add the FW_CONFIG to FIP and specify the same to certtool
|
||||
$(eval $(call TOOL_ADD_PAYLOAD,${STM32MP_FW_CONFIG},--fw-config))
|
||||
# Add the HW_CONFIG to FIP and specify the same to certtool
|
||||
$(eval $(call TOOL_ADD_PAYLOAD,${STM32MP_HW_CONFIG},--hw-config))
|
||||
ifeq ($(GENERATE_COT),1)
|
||||
STM32MP_CFG_CERT := $(BUILD_PLAT)/stm32mp_cfg_cert.crt
|
||||
# Add the STM32MP_CFG_CERT to FIP and specify the same to certtool
|
||||
|
|
@ -203,15 +151,6 @@ endif
|
|||
ifeq ($(AARCH32_SP),sp_min)
|
||||
STM32MP_TOS_FW_CONFIG := $(addprefix ${BUILD_PLAT}/fdts/, $(patsubst %.dtb,%-bl32.dtb,$(DTB_FILE_NAME)))
|
||||
$(eval $(call TOOL_ADD_PAYLOAD,${STM32MP_TOS_FW_CONFIG},--tos-fw-config))
|
||||
else
|
||||
# Add the build options to pack Trusted OS Extra1 and Trusted OS Extra2 images
|
||||
# in the FIP if the platform requires.
|
||||
ifneq ($(BL32_EXTRA1),)
|
||||
$(eval $(call TOOL_ADD_IMG,BL32_EXTRA1,--tos-fw-extra1,,$(ENCRYPT_BL32)))
|
||||
endif
|
||||
ifneq ($(BL32_EXTRA2),)
|
||||
$(eval $(call TOOL_ADD_IMG,BL32_EXTRA2,--tos-fw-extra2,,$(ENCRYPT_BL32)))
|
||||
endif
|
||||
endif
|
||||
|
||||
# Enable flags for C files
|
||||
|
|
@ -220,20 +159,9 @@ $(eval $(call assert_booleans,\
|
|||
PKA_USE_BRAINPOOL_P256T1 \
|
||||
PKA_USE_NIST_P256 \
|
||||
PLAT_TBBR_IMG_DEF \
|
||||
PLAT_XLAT_TABLES_DYNAMIC \
|
||||
STM32MP_CRYPTO_ROM_LIB \
|
||||
STM32MP_DDR_32BIT_INTERFACE \
|
||||
STM32MP_DDR_DUAL_AXI_PORT \
|
||||
STM32MP_EARLY_CONSOLE \
|
||||
STM32MP_EMMC \
|
||||
STM32MP_EMMC_BOOT \
|
||||
STM32MP_RAW_NAND \
|
||||
STM32MP_RECONFIGURE_CONSOLE \
|
||||
STM32MP_SDMMC \
|
||||
STM32MP_SPI_NAND \
|
||||
STM32MP_SPI_NOR \
|
||||
STM32MP_UART_PROGRAMMER \
|
||||
STM32MP_USB_PROGRAMMER \
|
||||
STM32MP_USE_EXTERNAL_HEAP \
|
||||
STM32MP13 \
|
||||
STM32MP15 \
|
||||
|
|
@ -246,8 +174,6 @@ $(eval $(call assert_numerics,\
|
|||
STM32_HEADER_VERSION_MAJOR \
|
||||
STM32_RNG_VER \
|
||||
STM32_TF_A_COPIES \
|
||||
STM32_TF_VERSION \
|
||||
STM32MP_UART_BAUDRATE \
|
||||
)))
|
||||
|
||||
$(eval $(call add_defines,\
|
||||
|
|
@ -257,41 +183,22 @@ $(eval $(call add_defines,\
|
|||
PKA_USE_NIST_P256 \
|
||||
PLAT_PARTITION_MAX_ENTRIES \
|
||||
PLAT_TBBR_IMG_DEF \
|
||||
PLAT_XLAT_TABLES_DYNAMIC \
|
||||
STM32_HASH_VER \
|
||||
STM32_HEADER_VERSION_MAJOR \
|
||||
STM32_RNG_VER \
|
||||
STM32_TF_A_COPIES \
|
||||
STM32_TF_VERSION \
|
||||
STM32MP_CRYPTO_ROM_LIB \
|
||||
STM32MP_DDR_32BIT_INTERFACE \
|
||||
STM32MP_DDR_DUAL_AXI_PORT \
|
||||
STM32MP_EARLY_CONSOLE \
|
||||
STM32MP_EMMC \
|
||||
STM32MP_EMMC_BOOT \
|
||||
STM32MP_RAW_NAND \
|
||||
STM32MP_RECONFIGURE_CONSOLE \
|
||||
STM32MP_SDMMC \
|
||||
STM32MP_SPI_NAND \
|
||||
STM32MP_SPI_NOR \
|
||||
STM32MP_UART_BAUDRATE \
|
||||
STM32MP_UART_PROGRAMMER \
|
||||
STM32MP_USB_PROGRAMMER \
|
||||
STM32MP_USE_EXTERNAL_HEAP \
|
||||
STM32MP13 \
|
||||
STM32MP15 \
|
||||
)))
|
||||
|
||||
# Include paths and source files
|
||||
PLAT_INCLUDES := -Iplat/st/common/include/
|
||||
PLAT_INCLUDES += -Iplat/st/stm32mp1/include/
|
||||
|
||||
include lib/fconf/fconf.mk
|
||||
include lib/libfdt/libfdt.mk
|
||||
|
||||
PLAT_BL_COMMON_SOURCES := common/uuid.c \
|
||||
plat/st/common/stm32mp_common.c \
|
||||
plat/st/stm32mp1/stm32mp1_private.c
|
||||
PLAT_BL_COMMON_SOURCES += plat/st/stm32mp1/stm32mp1_private.c
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += drivers/st/uart/aarch32/stm32_console.S
|
||||
|
||||
|
|
@ -299,28 +206,16 @@ ifneq (${ENABLE_STACK_PROTECTOR},0)
|
|||
PLAT_BL_COMMON_SOURCES += plat/st/stm32mp1/stm32mp1_stack_protector.c
|
||||
endif
|
||||
|
||||
include lib/xlat_tables_v2/xlat_tables.mk
|
||||
PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS}
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += lib/cpus/aarch32/cortex_a7.S
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += drivers/arm/tzc/tzc400.c \
|
||||
drivers/clk/clk.c \
|
||||
drivers/delay_timer/delay_timer.c \
|
||||
drivers/delay_timer/generic_delay_timer.c \
|
||||
drivers/st/bsec/bsec2.c \
|
||||
drivers/st/clk/stm32mp_clkfunc.c \
|
||||
drivers/st/ddr/stm32mp_ddr.c \
|
||||
drivers/st/ddr/stm32mp1_ddr_helpers.c \
|
||||
drivers/st/gpio/stm32_gpio.c \
|
||||
drivers/st/i2c/stm32_i2c.c \
|
||||
drivers/st/iwdg/stm32_iwdg.c \
|
||||
drivers/st/pmic/stm32mp_pmic.c \
|
||||
drivers/st/pmic/stpmic1.c \
|
||||
drivers/st/regulator/regulator_core.c \
|
||||
drivers/st/regulator/regulator_fixed.c \
|
||||
drivers/st/reset/stm32mp1_reset.c \
|
||||
plat/st/common/stm32mp_dt.c \
|
||||
plat/st/stm32mp1/stm32mp1_dbgmcu.c \
|
||||
plat/st/stm32mp1/stm32mp1_helper.S \
|
||||
plat/st/stm32mp1/stm32mp1_syscfg.c
|
||||
|
|
@ -333,195 +228,54 @@ else
|
|||
PLAT_BL_COMMON_SOURCES += drivers/st/clk/stm32mp1_clk.c
|
||||
endif
|
||||
|
||||
BL2_SOURCES += ${FCONF_SOURCES} ${FCONF_DYN_SOURCES}
|
||||
|
||||
BL2_SOURCES += drivers/io/io_fip.c \
|
||||
plat/st/common/bl2_io_storage.c \
|
||||
plat/st/common/stm32mp_fconf_io.c \
|
||||
plat/st/stm32mp1/plat_bl2_mem_params_desc.c \
|
||||
BL2_SOURCES += plat/st/stm32mp1/plat_bl2_mem_params_desc.c \
|
||||
plat/st/stm32mp1/stm32mp1_fconf_firewall.c
|
||||
|
||||
include lib/zlib/zlib.mk
|
||||
|
||||
ifeq (${PSA_FWU_SUPPORT},1)
|
||||
include drivers/fwu/fwu.mk
|
||||
endif
|
||||
|
||||
|
||||
BL2_SOURCES += $(ZLIB_SOURCES)
|
||||
|
||||
BL2_SOURCES += drivers/io/io_block.c \
|
||||
drivers/io/io_mtd.c \
|
||||
drivers/io/io_storage.c \
|
||||
drivers/st/crypto/stm32_hash.c \
|
||||
BL2_SOURCES += drivers/st/crypto/stm32_hash.c \
|
||||
plat/st/stm32mp1/bl2_plat_setup.c
|
||||
|
||||
ifneq (${DECRYPTION_SUPPORT},none)
|
||||
BL2_SOURCES += drivers/io/io_encrypted.c
|
||||
endif
|
||||
|
||||
ifeq (${TRUSTED_BOARD_BOOT},1)
|
||||
AUTH_SOURCES := drivers/auth/auth_mod.c \
|
||||
drivers/auth/crypto_mod.c \
|
||||
drivers/auth/img_parser_mod.c
|
||||
|
||||
ifeq (${GENERATE_COT},1)
|
||||
TFW_NVCTR_VAL := 0
|
||||
NTFW_NVCTR_VAL := 0
|
||||
KEY_SIZE :=
|
||||
KEY_ALG := ecdsa
|
||||
HASH_ALG := sha256
|
||||
|
||||
ifeq (${SAVE_KEYS},1)
|
||||
TRUSTED_WORLD_KEY ?= ${BUILD_PLAT}/trusted.pem
|
||||
NON_TRUSTED_WORLD_KEY ?= ${BUILD_PLAT}/non-trusted.pem
|
||||
BL32_KEY ?= ${BUILD_PLAT}/trusted_os.pem
|
||||
BL33_KEY ?= ${BUILD_PLAT}/non-trusted_os.pem
|
||||
endif
|
||||
|
||||
endif
|
||||
TF_MBEDTLS_KEY_ALG := ecdsa
|
||||
|
||||
ifneq (${MBEDTLS_DIR},)
|
||||
MBEDTLS_MAJOR=$(shell grep -hP "define MBEDTLS_VERSION_MAJOR" \
|
||||
${MBEDTLS_DIR}/include/mbedtls/*.h | grep -oe '\([0-9.]*\)')
|
||||
|
||||
ifeq (${MBEDTLS_MAJOR}, 2)
|
||||
MBEDTLS_CONFIG_FILE ?= "<stm32mp1_mbedtls_config-2.h>"
|
||||
endif
|
||||
|
||||
ifeq (${MBEDTLS_MAJOR}, 3)
|
||||
MBEDTLS_CONFIG_FILE ?= "<stm32mp1_mbedtls_config-3.h>"
|
||||
endif
|
||||
endif
|
||||
|
||||
include drivers/auth/mbedtls/mbedtls_x509.mk
|
||||
|
||||
COT_DESC_IN_DTB := 1
|
||||
AUTH_SOURCES += lib/fconf/fconf_cot_getter.c \
|
||||
lib/fconf/fconf_tbbr_getter.c \
|
||||
plat/st/common/stm32mp_crypto_lib.c
|
||||
|
||||
ifeq ($(STM32MP13),1)
|
||||
AUTH_SOURCES += drivers/st/crypto/stm32_pka.c
|
||||
AUTH_SOURCES += drivers/st/crypto/stm32_saes.c
|
||||
BL2_SOURCES += drivers/st/crypto/stm32_pka.c
|
||||
BL2_SOURCES += drivers/st/crypto/stm32_saes.c
|
||||
endif
|
||||
|
||||
BL2_SOURCES += $(AUTH_SOURCES) \
|
||||
plat/st/common/stm32mp_trusted_boot.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_EMMC} ${STM32MP_SDMMC}),)
|
||||
BL2_SOURCES += drivers/mmc/mmc.c \
|
||||
drivers/partition/gpt.c \
|
||||
drivers/partition/partition.c \
|
||||
drivers/st/mmc/stm32_sdmmc2.c
|
||||
BL2_SOURCES += drivers/st/mmc/stm32_sdmmc2.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_RAW_NAND},1)
|
||||
$(eval $(call add_define_val,NAND_ONFI_DETECT,1))
|
||||
BL2_SOURCES += drivers/mtd/nand/raw_nand.c \
|
||||
drivers/st/fmc/stm32_fmc2_nand.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_SPI_NAND},1)
|
||||
BL2_SOURCES += drivers/mtd/nand/spi_nand.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_SPI_NOR},1)
|
||||
ifneq (${STM32MP_FORCE_MTD_START_OFFSET},)
|
||||
$(eval $(call add_define_val,STM32MP_NOR_FIP_OFFSET,${STM32MP_FORCE_MTD_START_OFFSET}))
|
||||
endif
|
||||
BL2_SOURCES += drivers/mtd/nor/spi_nor.c
|
||||
BL2_SOURCES += drivers/st/fmc/stm32_fmc2_nand.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_SPI_NAND} ${STM32MP_SPI_NOR}),)
|
||||
BL2_SOURCES += drivers/mtd/spi-mem/spi_mem.c \
|
||||
drivers/st/spi/stm32_qspi.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_RAW_NAND} ${STM32MP_SPI_NAND}),)
|
||||
ifneq (${STM32MP_FORCE_MTD_START_OFFSET},)
|
||||
$(eval $(call add_define_val,STM32MP_NAND_FIP_OFFSET,${STM32MP_FORCE_MTD_START_OFFSET}))
|
||||
endif
|
||||
BL2_SOURCES += drivers/mtd/nand/core.c
|
||||
BL2_SOURCES += drivers/st/spi/stm32_qspi.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_RAW_NAND} ${STM32MP_SPI_NAND} ${STM32MP_SPI_NOR}),)
|
||||
BL2_SOURCES += plat/st/stm32mp1/stm32mp1_boot_device.c
|
||||
endif
|
||||
|
||||
ifneq ($(filter 1,${STM32MP_UART_PROGRAMMER} ${STM32MP_USB_PROGRAMMER}),)
|
||||
BL2_SOURCES += drivers/io/io_memmap.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_UART_PROGRAMMER},1)
|
||||
BL2_SOURCES += drivers/st/uart/stm32_uart.c \
|
||||
plat/st/common/stm32cubeprogrammer_uart.c
|
||||
BL2_SOURCES += drivers/st/uart/stm32_uart.c
|
||||
endif
|
||||
|
||||
ifeq (${STM32MP_USB_PROGRAMMER},1)
|
||||
#The DFU stack uses only one end point, reduce the USB stack footprint
|
||||
$(eval $(call add_define_val,CONFIG_USBD_EP_NB,1U))
|
||||
BL2_SOURCES += drivers/st/usb/stm32mp1_usb.c \
|
||||
drivers/usb/usb_device.c \
|
||||
plat/st/common/stm32cubeprogrammer_usb.c \
|
||||
plat/st/common/usb_dfu.c \
|
||||
plat/st/stm32mp1/stm32mp1_usb_dfu.c
|
||||
endif
|
||||
|
||||
BL2_SOURCES += drivers/st/ddr/stm32mp_ddr_test.c \
|
||||
drivers/st/ddr/stm32mp_ram.c \
|
||||
drivers/st/ddr/stm32mp1_ddr.c \
|
||||
BL2_SOURCES += drivers/st/ddr/stm32mp1_ddr.c \
|
||||
drivers/st/ddr/stm32mp1_ram.c
|
||||
|
||||
BL2_SOURCES += common/desc_image_load.c \
|
||||
plat/st/stm32mp1/plat_image_load.c
|
||||
|
||||
BL2_SOURCES += lib/optee/optee_utils.c
|
||||
|
||||
# Compilation rules
|
||||
.PHONY: check_dtc_version stm32image clean_stm32image check_boot_device
|
||||
.SUFFIXES:
|
||||
|
||||
all: check_dtc_version stm32image ${STM32_TF_STM32}
|
||||
|
||||
distclean realclean clean: clean_stm32image
|
||||
|
||||
bl2: check_boot_device
|
||||
|
||||
check_boot_device:
|
||||
@if [ ${STM32MP_EMMC} != 1 ] && \
|
||||
[ ${STM32MP_SDMMC} != 1 ] && \
|
||||
[ ${STM32MP_RAW_NAND} != 1 ] && \
|
||||
[ ${STM32MP_SPI_NAND} != 1 ] && \
|
||||
[ ${STM32MP_SPI_NOR} != 1 ] && \
|
||||
[ ${STM32MP_UART_PROGRAMMER} != 1 ] && \
|
||||
[ ${STM32MP_USB_PROGRAMMER} != 1 ]; then \
|
||||
echo "No boot device driver is enabled"; \
|
||||
false; \
|
||||
fi
|
||||
|
||||
stm32image: ${STM32IMAGE}
|
||||
|
||||
${STM32IMAGE}: ${STM32IMAGE_SRC}
|
||||
${Q}${MAKE} CPPFLAGS="" --no-print-directory -C ${STM32IMAGEPATH}
|
||||
|
||||
clean_stm32image:
|
||||
${Q}${MAKE} --no-print-directory -C ${STM32IMAGEPATH} clean
|
||||
|
||||
check_dtc_version:
|
||||
@if [ ${DTC_VERSION} -lt 10404 ]; then \
|
||||
echo "dtc version too old (${DTC_V}), you need at least version 1.4.4"; \
|
||||
false; \
|
||||
fi
|
||||
|
||||
# Create DTB file for BL2
|
||||
${BUILD_PLAT}/fdts/%-bl2.dts: fdts/%.dts fdts/${BL2_DTSI} | ${BUILD_PLAT} fdt_dirs
|
||||
@echo '#include "$(patsubst fdts/%,%,$<)"' > $@
|
||||
@echo '#include "${BL2_DTSI}"' >> $@
|
||||
|
||||
${BUILD_PLAT}/fdts/%-bl2.dtb: ${BUILD_PLAT}/fdts/%-bl2.dts
|
||||
BL2_SOURCES += plat/st/stm32mp1/plat_image_load.c
|
||||
|
||||
ifeq ($(AARCH32_SP),sp_min)
|
||||
# Create DTB file for BL32
|
||||
|
|
@ -532,33 +286,4 @@ ${BUILD_PLAT}/fdts/%-bl32.dts: fdts/%.dts fdts/${BL32_DTSI} | ${BUILD_PLAT} fdt_
|
|||
${BUILD_PLAT}/fdts/%-bl32.dtb: ${BUILD_PLAT}/fdts/%-bl32.dts
|
||||
endif
|
||||
|
||||
${BUILD_PLAT}/stm32mp1-%.o: ${BUILD_PLAT}/fdts/%-bl2.dtb plat/st/stm32mp1/stm32mp1.S bl2
|
||||
@echo " AS stm32mp1.S"
|
||||
${Q}${AS} ${ASFLAGS} ${TF_CFLAGS} \
|
||||
-DDTB_BIN_PATH=\"$<\" \
|
||||
-c plat/st/stm32mp1/stm32mp1.S -o $@
|
||||
|
||||
$(eval $(call MAKE_LD,${STM32_TF_LINKERFILE},plat/st/stm32mp1/stm32mp1.ld.S,bl2))
|
||||
|
||||
tf-a-%.elf: stm32mp1-%.o ${STM32_TF_LINKERFILE}
|
||||
@echo " LDS $<"
|
||||
${Q}${LD} -o $@ ${STM32_TF_ELF_LDFLAGS} -Map=$(@:.elf=.map) --script ${STM32_TF_LINKERFILE} $<
|
||||
|
||||
tf-a-%.bin: tf-a-%.elf
|
||||
${Q}${OC} -O binary $< $@
|
||||
@echo
|
||||
@echo "Built $@ successfully"
|
||||
@echo
|
||||
|
||||
tf-a-%.stm32: ${STM32IMAGE} tf-a-%.bin
|
||||
@echo
|
||||
@echo "Generate $@"
|
||||
$(eval LOADADDR = $(shell cat $(@:.stm32=.map) | grep RAM | awk '{print $$2}'))
|
||||
$(eval ENTRY = $(shell cat $(@:.stm32=.map) | grep "__BL2_IMAGE_START" | awk '{print $$1}'))
|
||||
${Q}${STM32IMAGE} -s $(word 2,$^) -d $@ \
|
||||
-l $(LOADADDR) -e ${ENTRY} \
|
||||
-v ${STM32_TF_VERSION} \
|
||||
-m ${STM32_HEADER_VERSION_MAJOR} \
|
||||
-n ${STM32_HEADER_VERSION_MINOR} \
|
||||
-b ${STM32_HEADER_BL2_BINARY_TYPE}
|
||||
@echo
|
||||
include plat/st/common/common_rules.mk
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue