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