diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2018-10-11 09:55:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 09:55:00 +0100 |
| commit | 60a9dee5cadebad1ae53f829df42cf7c5a138de3 (patch) | |
| tree | 860b585defc3f383fe6f9eb1c5a22842d6b577cb | |
| parent | f7a18268ad2201176ffc882b43c900f9d025bde1 (diff) | |
| parent | 49d3a621469877a2d9bfae09d0f09befc35f3879 (diff) | |
Merge pull request #1620 from deepan02/deepak-arm/move-reset-to-bl31
plat/arm: allow RESET_TO_BL31 for CSS-based platforms
| -rw-r--r-- | plat/arm/board/juno/platform.mk | 5 | ||||
| -rw-r--r-- | plat/arm/css/common/css_common.mk | 5 | ||||
| -rw-r--r-- | plat/arm/css/sgi/sgi-common.mk | 5 | ||||
| -rw-r--r-- | plat/arm/css/sgm/sgm-common.mk | 5 |
4 files changed, 15 insertions, 5 deletions
diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk index 90fa938a..e6c44bb4 100644 --- a/plat/arm/board/juno/platform.mk +++ b/plat/arm/board/juno/platform.mk @@ -90,6 +90,11 @@ endif endif +ifneq (${RESET_TO_BL31},0) + $(error "Using BL31 as the reset vector is not supported on ${PLATFORM} platform. \ + Please set RESET_TO_BL31 to 0.") +endif + # Errata workarounds for Cortex-A53: ERRATA_A53_826319 := 1 ERRATA_A53_835769 := 1 diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk index 984c1da0..ca1edab1 100644 --- a/plat/arm/css/common/css_common.mk +++ b/plat/arm/css/common/css_common.mk @@ -39,11 +39,6 @@ BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \ plat/arm/css/drivers/mhu/css_mhu_doorbell.c endif -ifneq (${RESET_TO_BL31},0) - $(error "Using BL31 as the reset vector is not supported on CSS platforms. \ - Please set RESET_TO_BL31 to 0.") -endif - # Process CSS_LOAD_SCP_IMAGES flag $(eval $(call assert_boolean,CSS_LOAD_SCP_IMAGES)) $(eval $(call add_define,CSS_LOAD_SCP_IMAGES)) diff --git a/plat/arm/css/sgi/sgi-common.mk b/plat/arm/css/sgi/sgi-common.mk index 28f97b1f..24f03dd4 100644 --- a/plat/arm/css/sgi/sgi-common.mk +++ b/plat/arm/css/sgi/sgi-common.mk @@ -67,6 +67,11 @@ HW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}.dtb # Add the HW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config)) +ifneq (${RESET_TO_BL31},0) + $(error "Using BL31 as the reset vector is not supported on ${PLATFORM} platform. \ + Please set RESET_TO_BL31 to 0.") +endif + $(eval $(call add_define,SGI_PLAT)) override CSS_LOAD_SCP_IMAGES := 0 diff --git a/plat/arm/css/sgm/sgm-common.mk b/plat/arm/css/sgm/sgm-common.mk index b10e14cb..3eb48403 100644 --- a/plat/arm/css/sgm/sgm-common.mk +++ b/plat/arm/css/sgm/sgm-common.mk @@ -45,6 +45,11 @@ BL31_SOURCES += $(SGM_CPU_SOURCES) \ ${CSS_SGM_BASE}/sgm_bl31_setup.c \ ${CSS_SGM_BASE}/sgm_plat_config.c +ifneq (${RESET_TO_BL31},0) + $(error "Using BL31 as the reset vector is not supported on ${PLATFORM} platform. \ + Please set RESET_TO_BL31 to 0.") +endif + # sgm uses CCI-500 as Cache Coherent Interconnect ARM_CCI_PRODUCT_ID := 500 |