Updates to aarch64 startup to support EL2.

Author: dgarske

IDE/XilinxSDK/README.md

@@ -238,7 +238,7 @@ Successfully ran Hello World application
     * `bootgen -image boot.bif -arch zynqmp -o i BOOT.BIN -w`
 
 Note: To generate a report of a boot.bin use the `bootgen_utility` or after 2022.1 use `bootgen -read`:
-`bootgen -read -arch zynqmp -bin boot.bin -out boot.bin.txt`
+`bootgen -arch zynqmp -read BOOT.BIN`
 
 ## Post Quantum
 

hal/zynq.c

@@ -899,7 +899,7 @@ void hal_init(void)
 #endif
     wolfBoot_printf(bootMsg);
 
-#ifdef USE_BUILTIN_STARTUP /* Vitis is EL-3 */
+#if 0
     /* This is only allowed for EL-3 */
     asm volatile("msr cntfrq_el0, %0" : : "r" (cpu_freq) : "memory");
 #endif

hal/zynq.h

@@ -22,11 +22,16 @@
 #ifndef _ZYNQMP_H_
 #define _ZYNQMP_H_
 
-#define EL3           1
-#define EL1_NONSECURE 0
-#define HYP_GUEST     0
-#if 1
-    #define FREERTOS_BSP
+/* By default expect EL2 */
+#define EL3_SECURE     0
+#define EL2_HYPERVISOR 1
+#define EL1_NONSECURE  0
+
+#define HYP_GUEST      0 /* ZEN Hypervisor guest format support */
+
+/* Floating Point Trap Enable */
+#ifndef FPU_TRAP
+#define FPU_TRAP       0
 #endif
 
 /* Errata: 855873: An eviction might overtake a cache clean operation */

hal/zynq.ld

@@ -11,8 +11,9 @@ _EL2_STACK_SIZE = DEFINED(_EL2_STACK_SIZE) ? _EL2_STACK_SIZE : 1024;
 /* Define Memories in the system */
 MEMORY
 {
-   psu_ddr_0_MEM_0 : ORIGIN = 0x40000000, LENGTH = 0x100000
    /* psu_ddr_0_MEM_0 : ORIGIN = 0x0, LENGTH = 0x7FF00000 */
+   /* Use 0x8000000 base for wolfBoot start */
+   psu_ddr_0_MEM_0 : ORIGIN = 0x8000000, LENGTH = 0x100000
    psu_ddr_1_MEM_0 : ORIGIN = 0x800000000, LENGTH = 0x80000000
    psu_ocm_ram_0_MEM_0 : ORIGIN = 0xFFFC0000, LENGTH = 0x40000
    psu_qspi_linear_0_MEM_0 : ORIGIN = 0xC0000000, LENGTH = 0x20000000