Merge changes I5ae9d08b,I5cbbd7eb,Idb389223 into integration
* changes:
plat: marvell: armada: Building ${DOIMAGETOOL} is only for a8k
plat: marvell: armada: Fix including plat/marvell/marvell.mk file
plat: marvell: armada: a3k: When WTP is empty do not define variables and targets which depends on it
This commit is contained in:
Varun Wadekar
TrustedFirmware Code Review
commit
9c28689a41
|
|
@ -15,12 +15,60 @@ MARVELL_DRV_BASE := drivers/marvell
|
|||
MARVELL_COMMON_BASE := $(MARVELL_PLAT_BASE)/common
|
||||
HANDLE_EA_EL3_FIRST := 1
|
||||
|
||||
include plat/marvell/marvell.mk
|
||||
|
||||
#*********** A3700 *************
|
||||
|
||||
# GICV3
|
||||
$(eval $(call add_define,CONFIG_GICV3))
|
||||
|
||||
# CCI-400
|
||||
$(eval $(call add_define,USE_CCI))
|
||||
|
||||
# Include GICv3 driver files
|
||||
include drivers/arm/gic/v3/gicv3.mk
|
||||
|
||||
MARVELL_GIC_SOURCES := ${GICV3_SOURCES} \
|
||||
plat/common/plat_gicv3.c
|
||||
|
||||
PLAT_INCLUDES := -I$(PLAT_FAMILY_BASE)/$(PLAT) \
|
||||
-I$(PLAT_COMMON_BASE)/include \
|
||||
-I$(PLAT_INCLUDE_BASE)/common \
|
||||
-I$(MARVELL_DRV_BASE) \
|
||||
-I$/drivers/arm/gic/common/
|
||||
|
||||
PLAT_BL_COMMON_SOURCES := $(PLAT_COMMON_BASE)/aarch64/a3700_common.c \
|
||||
$(MARVELL_COMMON_BASE)/marvell_cci.c \
|
||||
$(MARVELL_DRV_BASE)/uart/a3700_console.S
|
||||
|
||||
BL1_SOURCES += $(PLAT_COMMON_BASE)/aarch64/plat_helpers.S \
|
||||
lib/cpus/aarch64/cortex_a53.S
|
||||
|
||||
BL31_PORTING_SOURCES := $(PLAT_FAMILY_BASE)/$(PLAT)/board/pm_src.c
|
||||
|
||||
MARVELL_DRV := $(MARVELL_DRV_BASE)/comphy/phy-comphy-3700.c
|
||||
|
||||
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
||||
$(PLAT_COMMON_BASE)/aarch64/plat_helpers.S \
|
||||
$(PLAT_COMMON_BASE)/plat_pm.c \
|
||||
$(PLAT_COMMON_BASE)/dram_win.c \
|
||||
$(PLAT_COMMON_BASE)/io_addr_dec.c \
|
||||
$(PLAT_COMMON_BASE)/marvell_plat_config.c \
|
||||
$(PLAT_COMMON_BASE)/a3700_ea.c \
|
||||
$(PLAT_FAMILY_BASE)/$(PLAT)/plat_bl31_setup.c \
|
||||
$(MARVELL_COMMON_BASE)/marvell_ddr_info.c \
|
||||
$(MARVELL_COMMON_BASE)/marvell_gicv3.c \
|
||||
$(MARVELL_GIC_SOURCES) \
|
||||
drivers/arm/cci/cci.c \
|
||||
$(BL31_PORTING_SOURCES) \
|
||||
$(PLAT_COMMON_BASE)/a3700_sip_svc.c \
|
||||
$(MARVELL_DRV)
|
||||
|
||||
ifneq (${WTP},)
|
||||
|
||||
DOIMAGEPATH := $(WTP)
|
||||
DOIMAGETOOL := $(DOIMAGEPATH)/wtptp/linux/tbb_linux
|
||||
|
||||
include plat/marvell/marvell.mk
|
||||
|
||||
ifeq ($(MARVELL_SECURE_BOOT),1)
|
||||
DOIMAGE_CFG := $(DOIMAGEPATH)/atf-tim.txt
|
||||
IMAGESPATH := $(DOIMAGEPATH)/tim/trusted
|
||||
|
|
@ -72,55 +120,12 @@ TIMBLDUARTARGS := $(MARVELL_SECURE_BOOT) UART $(IMAGESPATH) $(DOIMAGEPATH) $(CL
|
|||
$(DDR_TOPOLOGY) 0 0 $(DOIMAGE_CFG) $(TIMNCFG) $(TIMNSIG) 0
|
||||
DOIMAGE_FLAGS := -r $(DOIMAGE_CFG) -v -D
|
||||
|
||||
# GICV3
|
||||
$(eval $(call add_define,CONFIG_GICV3))
|
||||
|
||||
# CCI-400
|
||||
$(eval $(call add_define,USE_CCI))
|
||||
|
||||
# Include GICv3 driver files
|
||||
include drivers/arm/gic/v3/gicv3.mk
|
||||
|
||||
MARVELL_GIC_SOURCES := ${GICV3_SOURCES} \
|
||||
plat/common/plat_gicv3.c
|
||||
|
||||
PLAT_INCLUDES := -I$(PLAT_FAMILY_BASE)/$(PLAT) \
|
||||
-I$(PLAT_COMMON_BASE)/include \
|
||||
-I$(PLAT_INCLUDE_BASE)/common \
|
||||
-I$(MARVELL_DRV_BASE) \
|
||||
-I$/drivers/arm/gic/common/
|
||||
|
||||
PLAT_BL_COMMON_SOURCES := $(PLAT_COMMON_BASE)/aarch64/a3700_common.c \
|
||||
$(MARVELL_COMMON_BASE)/marvell_cci.c \
|
||||
$(MARVELL_DRV_BASE)/uart/a3700_console.S
|
||||
|
||||
BL1_SOURCES += $(PLAT_COMMON_BASE)/aarch64/plat_helpers.S \
|
||||
lib/cpus/aarch64/cortex_a53.S
|
||||
|
||||
BL31_PORTING_SOURCES := $(PLAT_FAMILY_BASE)/$(PLAT)/board/pm_src.c
|
||||
|
||||
MARVELL_DRV := $(MARVELL_DRV_BASE)/comphy/phy-comphy-3700.c
|
||||
|
||||
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
||||
$(PLAT_COMMON_BASE)/aarch64/plat_helpers.S \
|
||||
$(PLAT_COMMON_BASE)/plat_pm.c \
|
||||
$(PLAT_COMMON_BASE)/dram_win.c \
|
||||
$(PLAT_COMMON_BASE)/io_addr_dec.c \
|
||||
$(PLAT_COMMON_BASE)/marvell_plat_config.c \
|
||||
$(PLAT_COMMON_BASE)/a3700_ea.c \
|
||||
$(PLAT_FAMILY_BASE)/$(PLAT)/plat_bl31_setup.c \
|
||||
$(MARVELL_COMMON_BASE)/marvell_ddr_info.c \
|
||||
$(MARVELL_COMMON_BASE)/marvell_gicv3.c \
|
||||
$(MARVELL_GIC_SOURCES) \
|
||||
drivers/arm/cci/cci.c \
|
||||
$(BL31_PORTING_SOURCES) \
|
||||
$(PLAT_COMMON_BASE)/a3700_sip_svc.c \
|
||||
$(MARVELL_DRV)
|
||||
|
||||
mrvl_flash: ${BUILD_PLAT}/${FIP_NAME} ${DOIMAGETOOL}
|
||||
$(shell truncate -s %128K ${BUILD_PLAT}/bl1.bin)
|
||||
$(shell cat ${BUILD_PLAT}/bl1.bin ${BUILD_PLAT}/${FIP_NAME} > ${BUILD_PLAT}/${BOOT_IMAGE})
|
||||
$(shell truncate -s %4 ${BUILD_PLAT}/${BOOT_IMAGE})
|
||||
$(if $(value MV_DDR_PATH),,$(error "Platform '${PLAT}' for target '$@' requires MV_DDR_PATH. Please set MV_DDR_PATH to point to the right directory"))
|
||||
${Q}${MAKE} --no-print-directory -C ${DOIMAGEPATH} WTMI_IMG=$(WTMI_IMG) MV_DDR_PATH=$(MV_DDR_PATH)
|
||||
$(shell truncate -s %4 $(WTMI_IMG))
|
||||
@echo
|
||||
@echo "Building uart images"
|
||||
|
|
@ -168,3 +173,10 @@ endif
|
|||
@mv -t $(BUILD_PLAT) $(TIM_IMAGE) $(DOIMAGE_CFG) $(TIMN_IMAGE) $(TIMNCFG) $(WTMI_IMG) $(WTMI_SYSINIT_IMG) $(WTMI_MULTI_IMG)
|
||||
@if [ "$(MARVELL_SECURE_BOOT)" = "1" ]; then mv -t $(BUILD_PLAT) $(WTMI_ENC_IMG) OtpHash.txt; fi
|
||||
@find . -name "*.txt" | grep -E "CSK[[:alnum:]]_KeyHash.txt|Tim_msg.txt|TIMHash.txt" | xargs rm -f
|
||||
|
||||
else # ${WTP}
|
||||
|
||||
mrvl_flash:
|
||||
$(error "Platform '${PLAT}' for target '$@' requires WTP. Please set WTP to point to the right directory")
|
||||
|
||||
endif # ${WTP}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
# https://spdx.org/licenses
|
||||
|
||||
include tools/marvell/doimage/doimage.mk
|
||||
|
||||
PLAT_FAMILY := a8k
|
||||
PLAT_INCLUDE_BASE := include/plat/marvell/armada/$(PLAT_FAMILY)
|
||||
PLAT_COMMON_BASE := plat/marvell/armada/a8k/common
|
||||
|
|
@ -33,6 +31,36 @@ $(eval $(call add_define,AP_NUM))
|
|||
DOIMAGEPATH ?= tools/marvell/doimage
|
||||
DOIMAGETOOL ?= ${DOIMAGEPATH}/doimage
|
||||
|
||||
include plat/marvell/marvell.mk
|
||||
include tools/marvell/doimage/doimage.mk
|
||||
|
||||
ifeq (${MARVELL_SECURE_BOOT},1)
|
||||
DOIMAGE_SEC_FLAGS := -c $(DOIMAGE_SEC)
|
||||
DOIMAGE_LIBS_CHECK = \
|
||||
if ! [ -d "/usr/include/mbedtls" ]; then \
|
||||
echo "****************************************" >&2; \
|
||||
echo "Missing mbedTLS installation! " >&2; \
|
||||
echo "Please download it from \"tls.mbed.org\"" >&2; \
|
||||
echo "Alternatively on Debian/Ubuntu system install" >&2; \
|
||||
echo "\"libmbedtls-dev\" package" >&2; \
|
||||
echo "Make sure to use version 2.1.0 or later" >&2; \
|
||||
echo "****************************************" >&2; \
|
||||
exit 1; \
|
||||
else if ! [ -f "/usr/include/libconfig.h" ]; then \
|
||||
echo "********************************************************" >&2; \
|
||||
echo "Missing Libconfig installation!" >&2; \
|
||||
echo "Please download it from \"www.hyperrealm.com/libconfig/\"" >&2; \
|
||||
echo "Alternatively on Debian/Ubuntu system install packages" >&2; \
|
||||
echo "\"libconfig8\" and \"libconfig8-dev\"" >&2; \
|
||||
echo "********************************************************" >&2; \
|
||||
exit 1; \
|
||||
fi \
|
||||
fi
|
||||
else #MARVELL_SECURE_BOOT
|
||||
DOIMAGE_LIBS_CHECK =
|
||||
DOIMAGE_SEC_FLAGS =
|
||||
endif #MARVELL_SECURE_BOOT
|
||||
|
||||
ROM_BIN_EXT ?= $(BUILD_PLAT)/ble.bin
|
||||
DOIMAGE_FLAGS += -b $(ROM_BIN_EXT) $(NAND_DOIMAGE_FLAGS) $(DOIMAGE_SEC_FLAGS)
|
||||
|
||||
|
|
@ -124,6 +152,14 @@ BLE_PATH ?= $(PLAT_COMMON_BASE)/ble
|
|||
include ${BLE_PATH}/ble.mk
|
||||
$(eval $(call MAKE_BL,e))
|
||||
|
||||
mrvl_clean:
|
||||
@echo " Doimage CLEAN"
|
||||
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${DOIMAGEPATH} clean
|
||||
|
||||
${DOIMAGETOOL}: mrvl_clean
|
||||
@$(DOIMAGE_LIBS_CHECK)
|
||||
${Q}${MAKE} --no-print-directory -C ${DOIMAGEPATH}
|
||||
|
||||
mrvl_flash: ${BUILD_PLAT}/${FIP_NAME} ${DOIMAGETOOL} ${BUILD_PLAT}/ble.bin
|
||||
$(shell truncate -s %128K ${BUILD_PLAT}/bl1.bin)
|
||||
$(shell cat ${BUILD_PLAT}/bl1.bin ${BUILD_PLAT}/${FIP_NAME} > ${BUILD_PLAT}/${BOOT_IMAGE})
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ MARVELL_PLAT_BASE := plat/marvell/armada
|
|||
MARVELL_PLAT_INCLUDE_BASE := include/plat/marvell/armada
|
||||
|
||||
include plat/marvell/version.mk
|
||||
include plat/marvell/marvell.mk
|
||||
|
||||
VERSION_STRING +=(Marvell-${SUBVERSION})
|
||||
|
||||
|
|
|
|||
|
|
@ -19,40 +19,3 @@ $(eval $(call add_define,PALLADIUM))
|
|||
# Set board to work with DDR 32bit
|
||||
DDR32 := 0
|
||||
$(eval $(call add_define,DDR32))
|
||||
|
||||
ifeq (${MARVELL_SECURE_BOOT},1)
|
||||
DOIMAGE_SEC_FLAGS := -c $(DOIMAGE_SEC)
|
||||
DOIMAGE_LIBS_CHECK = \
|
||||
if ! [ -d "/usr/include/mbedtls" ]; then \
|
||||
echo "****************************************" >&2; \
|
||||
echo "Missing mbedTLS installation! " >&2; \
|
||||
echo "Please download it from \"tls.mbed.org\"" >&2; \
|
||||
echo "Alternatively on Debian/Ubuntu system install" >&2; \
|
||||
echo "\"libmbedtls-dev\" package" >&2; \
|
||||
echo "Make sure to use version 2.1.0 or later" >&2; \
|
||||
echo "****************************************" >&2; \
|
||||
exit 1; \
|
||||
else if ! [ -f "/usr/include/libconfig.h" ]; then \
|
||||
echo "********************************************************" >&2; \
|
||||
echo "Missing Libconfig installation!" >&2; \
|
||||
echo "Please download it from \"www.hyperrealm.com/libconfig/\"" >&2; \
|
||||
echo "Alternatively on Debian/Ubuntu system install packages" >&2; \
|
||||
echo "\"libconfig8\" and \"libconfig8-dev\"" >&2; \
|
||||
echo "********************************************************" >&2; \
|
||||
exit 1; \
|
||||
fi \
|
||||
fi
|
||||
else #MARVELL_SECURE_BOOT
|
||||
DOIMAGE_LIBS_CHECK =
|
||||
DOIMAGE_SEC_FLAGS =
|
||||
endif #MARVELL_SECURE_BOOT
|
||||
|
||||
mrvl_clean:
|
||||
@echo " Doimage CLEAN"
|
||||
${Q}${MAKE} PLAT=${PLAT} --no-print-directory -C ${DOIMAGEPATH} clean
|
||||
|
||||
${DOIMAGETOOL}: mrvl_clean
|
||||
@$(DOIMAGE_LIBS_CHECK)
|
||||
${Q}${MAKE} --no-print-directory -C ${DOIMAGEPATH} VERSION=$(SUBVERSION) WTMI_IMG=$(WTMI_IMG)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue