From: Antonio Nino Diaz Date: Wed, 10 Oct 2018 10:02:34 +0000 (+0100) Subject: plat/arm: Move board_css_common.c to juno folder X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=58ea77a004906f163ff38636042c641b76360c61;p=project%2Fbcm63xx%2Fatf.git plat/arm: Move board_css_common.c to juno folder This file is only used by Juno as all other CSS platforms have their own private memory maps. Change-Id: I1c9f27aac7b1d8bff4d92674e8bde5505b93c8c4 Signed-off-by: Antonio Nino Diaz --- diff --git a/plat/arm/board/common/board_css.mk b/plat/arm/board/common/board_css.mk deleted file mode 100644 index 5ac213ac..00000000 --- a/plat/arm/board/common/board_css.mk +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -PLAT_BL_COMMON_SOURCES += plat/arm/board/common/board_css_common.c - -include plat/arm/board/common/board_common.mk diff --git a/plat/arm/board/common/board_css_common.c b/plat/arm/board/common/board_css_common.c deleted file mode 100644 index 40b1a275..00000000 --- a/plat/arm/board/common/board_css_common.c +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include -#include - -/* - * Table of memory regions for different BL stages to map using the MMU. - * This doesn't include Trusted SRAM as arm_setup_page_tables() already - * takes care of mapping it. - */ -#ifdef IMAGE_BL1 -const mmap_region_t plat_arm_mmap[] = { - ARM_MAP_SHARED_RAM, - V2M_MAP_FLASH0_RW, - V2M_MAP_IOFPGA, - CSS_MAP_DEVICE, - SOC_CSS_MAP_DEVICE, -#if TRUSTED_BOARD_BOOT - /* Map DRAM to authenticate NS_BL2U image. */ - ARM_MAP_NS_DRAM1, -#endif - {0} -}; -#endif -#ifdef IMAGE_BL2 -const mmap_region_t plat_arm_mmap[] = { - ARM_MAP_SHARED_RAM, - V2M_MAP_FLASH0_RW, -#ifdef PLAT_ARM_MEM_PROT_ADDR - ARM_V2M_MAP_MEM_PROTECT, -#endif - V2M_MAP_IOFPGA, - CSS_MAP_DEVICE, - SOC_CSS_MAP_DEVICE, - ARM_MAP_NS_DRAM1, -#ifdef AARCH64 - ARM_MAP_DRAM2, -#endif -#ifdef SPD_tspd - ARM_MAP_TSP_SEC_MEM, -#endif -#ifdef SPD_opteed - ARM_MAP_OPTEE_CORE_MEM, - ARM_OPTEE_PAGEABLE_LOAD_MEM, -#endif - {0} -}; -#endif -#ifdef IMAGE_BL2U -const mmap_region_t plat_arm_mmap[] = { - ARM_MAP_SHARED_RAM, - CSS_MAP_DEVICE, - CSS_MAP_SCP_BL2U, - V2M_MAP_IOFPGA, - SOC_CSS_MAP_DEVICE, - {0} -}; -#endif -#ifdef IMAGE_BL31 -const mmap_region_t plat_arm_mmap[] = { - ARM_MAP_SHARED_RAM, - V2M_MAP_IOFPGA, - CSS_MAP_DEVICE, -#ifdef PLAT_ARM_MEM_PROT_ADDR - ARM_V2M_MAP_MEM_PROTECT, -#endif - SOC_CSS_MAP_DEVICE, - {0} -}; -#endif -#ifdef IMAGE_BL32 -const mmap_region_t plat_arm_mmap[] = { -#ifdef AARCH32 - ARM_MAP_SHARED_RAM, -#ifdef PLAT_ARM_MEM_PROT_ADDR - ARM_V2M_MAP_MEM_PROTECT, -#endif -#endif - V2M_MAP_IOFPGA, - CSS_MAP_DEVICE, - SOC_CSS_MAP_DEVICE, - {0} -}; -#endif - -ARM_CASSERT_MMAP diff --git a/plat/arm/board/juno/juno_common.c b/plat/arm/board/juno/juno_common.c new file mode 100644 index 00000000..40b1a275 --- /dev/null +++ b/plat/arm/board/juno/juno_common.c @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +#include +#include + +/* + * Table of memory regions for different BL stages to map using the MMU. + * This doesn't include Trusted SRAM as arm_setup_page_tables() already + * takes care of mapping it. + */ +#ifdef IMAGE_BL1 +const mmap_region_t plat_arm_mmap[] = { + ARM_MAP_SHARED_RAM, + V2M_MAP_FLASH0_RW, + V2M_MAP_IOFPGA, + CSS_MAP_DEVICE, + SOC_CSS_MAP_DEVICE, +#if TRUSTED_BOARD_BOOT + /* Map DRAM to authenticate NS_BL2U image. */ + ARM_MAP_NS_DRAM1, +#endif + {0} +}; +#endif +#ifdef IMAGE_BL2 +const mmap_region_t plat_arm_mmap[] = { + ARM_MAP_SHARED_RAM, + V2M_MAP_FLASH0_RW, +#ifdef PLAT_ARM_MEM_PROT_ADDR + ARM_V2M_MAP_MEM_PROTECT, +#endif + V2M_MAP_IOFPGA, + CSS_MAP_DEVICE, + SOC_CSS_MAP_DEVICE, + ARM_MAP_NS_DRAM1, +#ifdef AARCH64 + ARM_MAP_DRAM2, +#endif +#ifdef SPD_tspd + ARM_MAP_TSP_SEC_MEM, +#endif +#ifdef SPD_opteed + ARM_MAP_OPTEE_CORE_MEM, + ARM_OPTEE_PAGEABLE_LOAD_MEM, +#endif + {0} +}; +#endif +#ifdef IMAGE_BL2U +const mmap_region_t plat_arm_mmap[] = { + ARM_MAP_SHARED_RAM, + CSS_MAP_DEVICE, + CSS_MAP_SCP_BL2U, + V2M_MAP_IOFPGA, + SOC_CSS_MAP_DEVICE, + {0} +}; +#endif +#ifdef IMAGE_BL31 +const mmap_region_t plat_arm_mmap[] = { + ARM_MAP_SHARED_RAM, + V2M_MAP_IOFPGA, + CSS_MAP_DEVICE, +#ifdef PLAT_ARM_MEM_PROT_ADDR + ARM_V2M_MAP_MEM_PROTECT, +#endif + SOC_CSS_MAP_DEVICE, + {0} +}; +#endif +#ifdef IMAGE_BL32 +const mmap_region_t plat_arm_mmap[] = { +#ifdef AARCH32 + ARM_MAP_SHARED_RAM, +#ifdef PLAT_ARM_MEM_PROT_ADDR + ARM_V2M_MAP_MEM_PROTECT, +#endif +#endif + V2M_MAP_IOFPGA, + CSS_MAP_DEVICE, + SOC_CSS_MAP_DEVICE, + {0} +}; +#endif + +ARM_CASSERT_MMAP diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk index 90fa938a..6c2daf13 100644 --- a/plat/arm/board/juno/platform.mk +++ b/plat/arm/board/juno/platform.mk @@ -29,7 +29,8 @@ CSS_USE_SCMI_SDS_DRIVER := 1 PLAT_INCLUDES := -Iplat/arm/board/juno/include \ -Iplat/arm/css/drivers/sds -PLAT_BL_COMMON_SOURCES := plat/arm/board/juno/${ARCH}/juno_helpers.S +PLAT_BL_COMMON_SOURCES := plat/arm/board/juno/${ARCH}/juno_helpers.S \ + plat/arm/board/juno/juno_common.c # Flag to enable support for AArch32 state on JUNO JUNO_AARCH32_EL3_RUNTIME := 0 @@ -118,7 +119,7 @@ SKIP_A57_L1_FLUSH_PWR_DWN := 1 # Do not enable SVE ENABLE_SVE_FOR_NS := 0 -include plat/arm/board/common/board_css.mk +include plat/arm/board/common/board_common.mk include plat/arm/common/arm_common.mk include plat/arm/soc/common/soc_css.mk include plat/arm/css/common/css_common.mk