diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-24 17:25:08 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:31:53 +0100 |
| commit | 99865e0afedca437ca1d3a63163370e17b5aac96 (patch) | |
| tree | dc3dd60109e4188e0f992a012351e8994713e85c /plat/imx/imx7 | |
| parent | 9e119a402546824a7d069a25389bf332ce179be3 (diff) | |
warp7: Migrate to new interfaces
- Fix reference to bl2_el3_early_platform_setup()
- Remove references to removed build options.
Change-Id: I9733bec64fc28db15716ddf481c05bdc30700b4a
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/imx/imx7')
| -rw-r--r-- | plat/imx/imx7/warp7/platform.mk | 10 | ||||
| -rw-r--r-- | plat/imx/imx7/warp7/warp7_bl2_el3_setup.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/plat/imx/imx7/warp7/platform.mk b/plat/imx/imx7/warp7/platform.mk index 279b5d2e..deb4c411 100644 --- a/plat/imx/imx7/warp7/platform.mk +++ b/plat/imx/imx7/warp7/platform.mk @@ -68,9 +68,6 @@ BL2_SOURCES += common/desc_image_load.c \ WORKAROUND_CVE_2017_5715 := 0 -# Disable the PSCI platform compatibility layer by default -ENABLE_PLAT_COMPAT := 0 - # Enable reset to BL31 by default RESET_TO_BL31 := 0 @@ -86,9 +83,6 @@ SEPARATE_CODE_AND_RODATA := 1 # Use Coherent memory USE_COHERENT_MEM := 1 -# Enable new version of image loading required for AArch32 -LOAD_IMAGE_V2 := 1 - # PLAT_WARP7_UART PLAT_WARP7_UART :=1 $(eval $(call add_define,PLAT_WARP7_UART)) @@ -96,10 +90,6 @@ $(eval $(call add_define,PLAT_WARP7_UART)) # Verify build config # ------------------- -ifneq (${LOAD_IMAGE_V2}, 1) - $(error Error: warp7 needs LOAD_IMAGE_V2=1) -endif - ifeq (${ARCH},aarch64) $(error Error: AArch64 not supported on i.mx7) endif diff --git a/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c b/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c index 14f86a17..10c4160c 100644 --- a/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c +++ b/plat/imx/imx7/warp7/warp7_bl2_el3_setup.c @@ -245,7 +245,7 @@ static void warp7_setup_usb_clocks(void) imx_clock_enable_usb(CCM_CCGR_ID_USB_OTG2_PHY); } /* - * bl2_early_platform_setup() + * bl2_el3_early_platform_setup() * MMU off */ void bl2_el3_early_platform_setup(u_register_t arg1, u_register_t arg2, |