diff options
author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2021-06-17 23:44:07 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-06-17 23:44:07 +0200 |
commit | 6db111968c6163a2d78d2df16b16fe11011f812b (patch) | |
tree | 925d45fe9b44fde22aa039462d281e3da6f602a4 /plat/st/stm32mp1 | |
parent | a8b7a175476c3b4a0199a4eee1fdcaf6249ab345 (diff) | |
parent | d3b0e8702a121c15ec8d8a018e2561085d41fb81 (diff) | |
download | trusted-firmware-a-6db111968c6163a2d78d2df16b16fe11011f812b.tar.gz |
Merge "refactor(plat/st): check boot device only for BL2" into integration
Diffstat (limited to 'plat/st/stm32mp1')
-rw-r--r-- | plat/st/stm32mp1/platform.mk | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk index 128dbc4ac6..e6645e06d6 100644 --- a/plat/st/stm32mp1/platform.mk +++ b/plat/st/stm32mp1/platform.mk @@ -44,11 +44,6 @@ STM32MP_SPI_NAND ?= 0 STM32MP_SPI_NOR ?= 0 STM32MP_EMMC_BOOT ?= 0 -ifeq ($(filter 1,${STM32MP_EMMC} ${STM32MP_SDMMC} ${STM32MP_RAW_NAND} \ - ${STM32MP_SPI_NAND} ${STM32MP_SPI_NOR}),) -$(error "No boot device driver is enabled") -endif - # Device tree DTB_FILE_NAME ?= stm32mp157c-ev1.dtb FDT_SOURCES := $(addprefix fdts/, $(patsubst %.dtb,%.dts,$(DTB_FILE_NAME))) @@ -199,13 +194,25 @@ BL2_SOURCES += lib/optee/optee_utils.c endif # Compilation rules -.PHONY: check_dtc_version stm32image clean_stm32image +.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 ]; then \ + echo "No boot device driver is enabled"; \ + false; \ + fi + stm32image: ${STM32IMAGE} ${STM32IMAGE}: ${STM32IMAGE_SRC} |