diff options
| author | danh-arm <dan.handley@arm.com> | 2016-12-20 17:00:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 17:00:59 +0000 |
| commit | e60f1897511c3852bd3e1bfc88c9ca7a6b2a1131 (patch) | |
| tree | d392ef6e3f180d418d7ee8fee056cf13fdb71abd | |
| parent | bd83b41a3037a44905410a15f9a19bc30a7130e5 (diff) | |
| parent | 34071d6aeca50ff8108a1a20c225c29b6db1d69a (diff) | |
| download | platform_external_arm-trusted-firmware-e60f1897511c3852bd3e1bfc88c9ca7a6b2a1131.tar.gz platform_external_arm-trusted-firmware-e60f1897511c3852bd3e1bfc88c9ca7a6b2a1131.tar.bz2 platform_external_arm-trusted-firmware-e60f1897511c3852bd3e1bfc88c9ca7a6b2a1131.zip | |
Merge pull request #792 from masahir0y/zynqmp
zynqmp: add "override" directive to mandatory options
| -rw-r--r-- | plat/xilinx/zynqmp/platform.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk index 588ba6127..d00b694c1 100644 --- a/plat/xilinx/zynqmp/platform.mk +++ b/plat/xilinx/zynqmp/platform.mk @@ -27,12 +27,12 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -ENABLE_PLAT_COMPAT := 0 -PROGRAMMABLE_RESET_ADDRESS := 1 +override ENABLE_PLAT_COMPAT := 0 +override PROGRAMMABLE_RESET_ADDRESS := 1 PSCI_EXTENDED_STATE_ID := 1 A53_DISABLE_NON_TEMPORAL_HINT := 0 SEPARATE_CODE_AND_RODATA := 1 -RESET_TO_BL31 := 1 +override RESET_TO_BL31 := 1 ifdef ZYNQMP_ATF_MEM_BASE $(eval $(call add_define,ZYNQMP_ATF_MEM_BASE)) @@ -97,7 +97,3 @@ BL31_SOURCES += drivers/arm/cci/cci.c \ plat/xilinx/zynqmp/pm_service/pm_api_sys.c \ plat/xilinx/zynqmp/pm_service/pm_ipi.c \ plat/xilinx/zynqmp/pm_service/pm_client.c - -ifneq (${RESET_TO_BL31},1) - $(error "Using BL31 as the reset vector is only one option supported on ZynqMP. Please set RESET_TO_BL31 to 1.") -endif |