From d1d32e691da1b618a4b03635117bcc6d619ba980 Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 9 Jan 2025 16:24:13 -0800 Subject: [PATCH] Avoid redefinition when using USE_BUILTIN_STARTUP. --- hal/zynq.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hal/zynq.h b/hal/zynq.h index c5f92695..63669260 100644 --- a/hal/zynq.h +++ b/hal/zynq.h @@ -22,6 +22,9 @@ #ifndef _ZYNQMP_H_ #define _ZYNQMP_H_ +#ifndef USE_BUILTIN_STARTUP +/* Macros needs for boot_aarch64_startup.S */ + /* By default expect EL2 at startup */ #ifndef EL3_SECURE #define EL3_SECURE 0 @@ -51,6 +54,9 @@ #define XPAR_PSU_DDR_1_S_AXI_BASEADDR 0x800000000 #define XPAR_PSU_DDR_1_S_AXI_HIGHADDR 0x87FFFFFFF +#endif /* USE_BUILTIN_STARTUP */ + + /* IOP System-level Control */ #define IOU_SLCR_BASSE 0xFF180000 #define IOU_TAPDLY_BYPASS_ADDR (IOU_SLCR_BASSE + 0x390)