0002-arm64-zynqmp-Enable-booting-to-ATF.patch 4.4 KB

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