1*4882a593SmuzhiyunFrom 5e3cac50cc981e01d9072241035a8d4162560c71 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Luca Ceresoli <luca@lucaceresoli.net> 3*4882a593SmuzhiyunDate: Mon, 12 Mar 2018 17:18:38 +0100 4*4882a593SmuzhiyunSubject: [PATCH] arm64: zynqmp: Enable booting to ATF 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunU-Boot is now able to boot to ARM Trusted Firmware (ATF). The boot 7*4882a593Smuzhiyunflow is SPL(EL3) loads ATF and full u-boot and jump to ATF(EL3) which 8*4882a593Smuzhiyunpass control to full u-boot(EL2). This has been tested on zcu106, so 9*4882a593Smuzhiyunenable it in this defconfig. 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunTo generate an image that triggers this booting flow, you need to pass 12*4882a593Smuzhiyun'-O arm-trusted-firmware' to mkimage. 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Luca Ceresoli <luca@lucaceresoli.net> 15*4882a593SmuzhiyunSigned-off-by: Michal Simek <michal.simek@xilinx.com> 16*4882a593SmuzhiyunBackported from upstream: http://git.denx.de/?p=u-boot.git;a=commit;h=5e3cac50cc981e01d9072241035a8d4162560c71 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun 19*4882a593Smuzhiyun configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 + 20*4882a593Smuzhiyun configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 + 21*4882a593Smuzhiyun configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig | 1 + 22*4882a593Smuzhiyun configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 1 + 23*4882a593Smuzhiyun configs/xilinx_zynqmp_zcu102_rev1_0_defconfig | 1 + 24*4882a593Smuzhiyun configs/xilinx_zynqmp_zcu102_revA_defconfig | 1 + 25*4882a593Smuzhiyun configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + 26*4882a593Smuzhiyun 7 files changed, 7 insertions(+) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig 29*4882a593Smuzhiyunindex c5bfa2b12638..488c72258b0e 100644 30*4882a593Smuzhiyun--- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig 31*4882a593Smuzhiyun+++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig 32*4882a593Smuzhiyun@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y 33*4882a593Smuzhiyun CONFIG_SPL_OS_BOOT=y 34*4882a593Smuzhiyun CONFIG_SPL_RAM_SUPPORT=y 35*4882a593Smuzhiyun CONFIG_SPL_RAM_DEVICE=y 36*4882a593Smuzhiyun+CONFIG_SPL_ATF=y 37*4882a593Smuzhiyun CONFIG_SYS_PROMPT="ZynqMP> " 38*4882a593Smuzhiyun CONFIG_FASTBOOT=y 39*4882a593Smuzhiyun CONFIG_FASTBOOT_FLASH=y 40*4882a593Smuzhiyundiff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig 41*4882a593Smuzhiyunindex f86dce403a42..5d501eec0edd 100644 42*4882a593Smuzhiyun--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig 43*4882a593Smuzhiyun+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig 44*4882a593Smuzhiyun@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y 45*4882a593Smuzhiyun CONFIG_SPL_OS_BOOT=y 46*4882a593Smuzhiyun CONFIG_SPL_RAM_SUPPORT=y 47*4882a593Smuzhiyun CONFIG_SPL_RAM_DEVICE=y 48*4882a593Smuzhiyun+CONFIG_SPL_ATF=y 49*4882a593Smuzhiyun CONFIG_SYS_PROMPT="ZynqMP> " 50*4882a593Smuzhiyun CONFIG_FASTBOOT=y 51*4882a593Smuzhiyun CONFIG_FASTBOOT_FLASH=y 52*4882a593Smuzhiyundiff --git a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig 53*4882a593Smuzhiyunindex 6e947cf56827..6f7eaebd7676 100644 54*4882a593Smuzhiyun--- a/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig 55*4882a593Smuzhiyun+++ b/configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig 56*4882a593Smuzhiyun@@ -16,6 +16,7 @@ CONFIG_BOARD_EARLY_INIT_R=y 57*4882a593Smuzhiyun CONFIG_SPL_OS_BOOT=y 58*4882a593Smuzhiyun CONFIG_SPL_RAM_SUPPORT=y 59*4882a593Smuzhiyun CONFIG_SPL_RAM_DEVICE=y 60*4882a593Smuzhiyun+CONFIG_SPL_ATF=y 61*4882a593Smuzhiyun CONFIG_SYS_PROMPT="ZynqMP> " 62*4882a593Smuzhiyun CONFIG_CMD_MEMTEST=y 63*4882a593Smuzhiyun CONFIG_SYS_ALT_MEMTEST=y 64*4882a593Smuzhiyundiff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig 65*4882a593Smuzhiyunindex 1c934858c61c..7a3806cba4b5 100644 66*4882a593Smuzhiyun--- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig 67*4882a593Smuzhiyun+++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig 68*4882a593Smuzhiyun@@ -17,6 +17,7 @@ CONFIG_BOARD_EARLY_INIT_R=y 69*4882a593Smuzhiyun CONFIG_SPL_OS_BOOT=y 70*4882a593Smuzhiyun CONFIG_SPL_RAM_SUPPORT=y 71*4882a593Smuzhiyun CONFIG_SPL_RAM_DEVICE=y 72*4882a593Smuzhiyun+CONFIG_SPL_ATF=y 73*4882a593Smuzhiyun CONFIG_SYS_PROMPT="ZynqMP> " 74*4882a593Smuzhiyun CONFIG_CMD_MEMTEST=y 75*4882a593Smuzhiyun CONFIG_SYS_ALT_MEMTEST=y 76*4882a593Smuzhiyundiff --git a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig 77*4882a593Smuzhiyunindex e13c7c56f310..e4408f182ca0 100644 78*4882a593Smuzhiyun--- a/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig 79*4882a593Smuzhiyun+++ b/configs/xilinx_zynqmp_zcu102_rev1_0_defconfig 80*4882a593Smuzhiyun@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y 81*4882a593Smuzhiyun CONFIG_SPL_OS_BOOT=y 82*4882a593Smuzhiyun CONFIG_SPL_RAM_SUPPORT=y 83*4882a593Smuzhiyun CONFIG_SPL_RAM_DEVICE=y 84*4882a593Smuzhiyun+CONFIG_SPL_ATF=y 85*4882a593Smuzhiyun CONFIG_SYS_PROMPT="ZynqMP> " 86*4882a593Smuzhiyun CONFIG_FASTBOOT=y 87*4882a593Smuzhiyun CONFIG_FASTBOOT_FLASH=y 88*4882a593Smuzhiyundiff --git a/configs/xilinx_zynqmp_zcu102_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig 89*4882a593Smuzhiyunindex 5b2cd495ee85..b52f6789fd4b 100644 90*4882a593Smuzhiyun--- a/configs/xilinx_zynqmp_zcu102_revA_defconfig 91*4882a593Smuzhiyun+++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig 92*4882a593Smuzhiyun@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y 93*4882a593Smuzhiyun CONFIG_SPL_OS_BOOT=y 94*4882a593Smuzhiyun CONFIG_SPL_RAM_SUPPORT=y 95*4882a593Smuzhiyun CONFIG_SPL_RAM_DEVICE=y 96*4882a593Smuzhiyun+CONFIG_SPL_ATF=y 97*4882a593Smuzhiyun CONFIG_SYS_PROMPT="ZynqMP> " 98*4882a593Smuzhiyun CONFIG_FASTBOOT=y 99*4882a593Smuzhiyun CONFIG_FASTBOOT_FLASH=y 100*4882a593Smuzhiyundiff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig 101*4882a593Smuzhiyunindex e6530fbfe7ff..80592554f682 100644 102*4882a593Smuzhiyun--- a/configs/xilinx_zynqmp_zcu102_revB_defconfig 103*4882a593Smuzhiyun+++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig 104*4882a593Smuzhiyun@@ -19,6 +19,7 @@ CONFIG_BOARD_EARLY_INIT_R=y 105*4882a593Smuzhiyun CONFIG_SPL_OS_BOOT=y 106*4882a593Smuzhiyun CONFIG_SPL_RAM_SUPPORT=y 107*4882a593Smuzhiyun CONFIG_SPL_RAM_DEVICE=y 108*4882a593Smuzhiyun+CONFIG_SPL_ATF=y 109*4882a593Smuzhiyun CONFIG_SYS_PROMPT="ZynqMP> " 110*4882a593Smuzhiyun CONFIG_FASTBOOT=y 111*4882a593Smuzhiyun CONFIG_FASTBOOT_FLASH=y 112*4882a593Smuzhiyun-- 113*4882a593Smuzhiyun2.7.4 114*4882a593Smuzhiyun 115