diff options
| author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2016-04-14 10:27:00 -0700 |
|---|---|---|
| committer | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2016-04-25 09:49:42 -0700 |
| commit | 01555332faa48a7361c2ff05446830ca791dd7b2 (patch) | |
| tree | 5c0988de8ff0021945466656d8e674ec209b26ca /plat/xilinx/zynqmp/platform.mk | |
| parent | 1c87351bfd2a7cfd6bf87691426123c0dd7166c9 (diff) | |
zynqmp: Revise memory configuration options
Drop the current configuration options for selecting the location of
the ATF and TSP (ZYNQMP_ATF_LOCATION, ZYNQMP_TSP_RAM_LOCATION).
The new configuration provides one default setup (ATF in OCM,
BL32 in DRAM). Additionally, the new configuration options
- ZYNQMP_ATF_MEM_BASE
- ZYNQMP_ATF_MEM_SIZE
- ZYNQMP_BL32_MEM_BASE
- ZYNQMP_BL32_MEM_SIZE
can be used to freely configure the memory locations used for ATF and
secure payload.
Also, allow setting the BL33 entry point via PRELOADED_BL33_BASE.
Cc: petalinux-dev@xilinx.com
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Diffstat (limited to 'plat/xilinx/zynqmp/platform.mk')
| -rw-r--r-- | plat/xilinx/zynqmp/platform.mk | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index febff29f..e0a325d0 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -31,29 +31,27 @@ PROGRAMMABLE_RESET_ADDRESS := 1 PSCI_EXTENDED_STATE_ID := 1 A53_DISABLE_NON_TEMPORAL_HINT := 0 -ZYNQMP_ATF_LOCATION ?= tsram -ifeq (${ZYNQMP_ATF_LOCATION}, tsram) - ZYNQMP_ATF_LOCATION_ID := ZYNQMP_IN_TRUSTED_SRAM -else ifeq (${ZYNQMP_ATF_LOCATION}, tdram) - ZYNQMP_ATF_LOCATION_ID := ZYNQMP_IN_TRUSTED_DRAM -else - $(error "Unsupported ZYNQMP_ATF_LOCATION value") -endif +ifdef ZYNQMP_ATF_MEM_BASE + $(eval $(call add_define,ZYNQMP_ATF_MEM_BASE)) + + ifndef ZYNQMP_ATF_MEM_SIZE + $(error "ZYNQMP_ATF_BASE defined without ZYNQMP_ATF_SIZE") + endif + $(eval $(call add_define,ZYNQMP_ATF_MEM_SIZE)) -# On ZYNQMP, the TSP can execute either from Trusted SRAM or Trusted DRAM. -# Trusted SRAM is the default. -ZYNQMP_TSP_RAM_LOCATION ?= tsram -ifeq (${ZYNQMP_TSP_RAM_LOCATION}, tsram) - ZYNQMP_TSP_RAM_LOCATION_ID := ZYNQMP_IN_TRUSTED_SRAM -else ifeq (${ZYNQMP_TSP_RAM_LOCATION}, tdram) - ZYNQMP_TSP_RAM_LOCATION_ID := ZYNQMP_IN_TRUSTED_DRAM -else - $(error "Unsupported ZYNQMP_TSP_RAM_LOCATION value") + ifdef ZYNQMP_ATF_MEM_PROGBITS_SIZE + $(eval $(call add_define,ZYNQMP_ATF_MEM_PROGBITS_SIZE)) + endif endif -# Process flags -$(eval $(call add_define,ZYNQMP_ATF_LOCATION_ID)) -$(eval $(call add_define,ZYNQMP_TSP_RAM_LOCATION_ID)) +ifdef ZYNQMP_BL32_MEM_BASE + $(eval $(call add_define,ZYNQMP_BL32_MEM_BASE)) + + ifndef ZYNQMP_BL32_MEM_SIZE + $(error "ZYNQMP_BL32_BASE defined without ZYNQMP_BL32_SIZE") + endif + $(eval $(call add_define,ZYNQMP_BL32_MEM_SIZE)) +endif PLAT_INCLUDES := -Iinclude/plat/arm/common/ \ -Iinclude/plat/arm/common/aarch64/ \ |