Skip to content

Commit 4103b8b

Browse files
dgarskedanielinux
authored andcommitted
Avoid redefinition when using USE_BUILTIN_STARTUP.
1 parent 5a7a0cf commit 4103b8b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

hal/zynq.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
#ifndef _ZYNQMP_H_
2323
#define _ZYNQMP_H_
2424

25+
#ifndef USE_BUILTIN_STARTUP
26+
/* Macros needs for boot_aarch64_startup.S */
27+
2528
/* By default expect EL2 at startup */
2629
#ifndef EL3_SECURE
2730
#define EL3_SECURE 0
@@ -51,6 +54,9 @@
5154
#define XPAR_PSU_DDR_1_S_AXI_BASEADDR 0x800000000
5255
#define XPAR_PSU_DDR_1_S_AXI_HIGHADDR 0x87FFFFFFF
5356

57+
#endif /* USE_BUILTIN_STARTUP */
58+
59+
5460
/* IOP System-level Control */
5561
#define IOU_SLCR_BASSE 0xFF180000
5662
#define IOU_TAPDLY_BYPASS_ADDR (IOU_SLCR_BASSE + 0x390)

0 commit comments

Comments
 (0)