diff options
| author | Yann Gautier <yann.gautier@st.com> | 2021-10-29 17:04:17 +0200 |
|---|---|---|
| committer | Yann Gautier <yann.gautier@st.com> | 2021-11-05 13:32:32 +0100 |
| commit | 325376eb818b95ade63a58476cf2e75c00578aa0 (patch) | |
| tree | 5d3aba7ef48d1625931f6cc1deb18e24b3587d49 /plat | |
| parent | 48382bbc2fb6e58033e74044e0a0fcb5560a7612 (diff) | |
| download | arm-trusted-firmware-325376eb818b95ade63a58476cf2e75c00578aa0.tar.gz | |
refactor(stm32mp1): use fconf.mk
Update STM32MP1 platform.mk file to include fconf.mk.
Change-Id: Idc623a832b4cdf9486835fc612803015f4f1a5f5
Signed-off-by: Yann Gautier <yann.gautier@st.com>
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/st/stm32mp1/platform.mk | 12 | ||||
| -rw-r--r-- | plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk index c8c2e5f0b..badc926c0 100644 --- a/plat/st/stm32mp1/platform.mk +++ b/plat/st/stm32mp1/platform.mk @@ -159,15 +159,17 @@ $(eval $(call add_defines,\ PLAT_INCLUDES := -Iplat/st/common/include/ PLAT_INCLUDES += -Iplat/st/stm32mp1/include/ +ifeq (${STM32MP_USE_STM32IMAGE},1) include common/fdt_wrappers.mk +else +include lib/fconf/fconf.mk +endif 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 += ${FDT_WRAPPERS_SOURCES} - PLAT_BL_COMMON_SOURCES += drivers/st/uart/aarch32/stm32_console.S ifneq (${ENABLE_STACK_PROTECTOR},0) @@ -199,14 +201,16 @@ PLAT_BL_COMMON_SOURCES += drivers/arm/tzc/tzc400.c \ plat/st/stm32mp1/stm32mp1_syscfg.c ifneq (${STM32MP_USE_STM32IMAGE},1) +BL2_SOURCES += ${FCONF_SOURCES} ${FCONF_DYN_SOURCES} + BL2_SOURCES += drivers/io/io_fip.c \ - lib/fconf/fconf.c \ - lib/fconf/fconf_dyn_cfg_getter.c \ plat/st/common/bl2_io_storage.c \ plat/st/common/stm32mp_fconf_io.c \ plat/st/stm32mp1/plat_bl2_mem_params_desc.c \ plat/st/stm32mp1/stm32mp1_fconf_firewall.c else +BL2_SOURCES += ${FDT_WRAPPERS_SOURCES} + BL2_SOURCES += drivers/io/io_dummy.c \ drivers/st/io/io_stm32image.c \ plat/st/common/bl2_stm32_io_storage.c \ diff --git a/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk b/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk index 4d4820afa..239b60af4 100644 --- a/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk +++ b/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk @@ -15,6 +15,10 @@ BL32_SOURCES += drivers/st/etzpc/etzpc.c \ plat/st/stm32mp1/stm32mp1_shared_resources.c \ plat/st/stm32mp1/stm32mp1_topology.c +# FDT wrappers +include common/fdt_wrappers.mk +BL32_SOURCES += ${FDT_WRAPPERS_SOURCES} + # Generic GIC v2 include drivers/arm/gic/v2/gicv2.mk |