From c5346ed5e5498b0ea0352785ed21c0f2d794c13f Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 8 Jul 2020 13:01:00 +0100 Subject: [PATCH] arm_fpga: Predefine DTB and BL33 load addresses The memory layout for the FPGA is fairly uniform for most of the FPGA images, and we already assume that DRAM starts at 2GB by default. Prepopulate PRELOADED_BL33_BASE and FPGA_PRELOADED_DTB_BASE to some sane default values, to simplify building some stock image. If people want to deviate from that, they can always override those addresses on the make command line. Change-Id: I2238fafb3f8253a01ad2d88d45827c141d9b29dd Signed-off-by: Andre Przywara --- plat/arm/board/arm_fpga/platform.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plat/arm/board/arm_fpga/platform.mk b/plat/arm/board/arm_fpga/platform.mk index 399f97748..e57912cfe 100644 --- a/plat/arm/board/arm_fpga/platform.mk +++ b/plat/arm/board/arm_fpga/platform.mk @@ -24,15 +24,10 @@ ifeq (${TRUSTED_BOARD_BOOT}, 1) $(error "TRUSTED_BOARD_BOOT must be disabled") endif -ifndef PRELOADED_BL33_BASE -$(error "PRELOADED_BL33_BASE is not set") -endif +PRELOADED_BL33_BASE := 0x80080000 -ifndef FPGA_PRELOADED_DTB_BASE -$(error "FPGA_PRELOADED_DTB_BASE is not set") -else +FPGA_PRELOADED_DTB_BASE := 0x80070000 $(eval $(call add_define,FPGA_PRELOADED_DTB_BASE)) -endif # Treating this as a memory-constrained port for now USE_COHERENT_MEM := 0