Skip to content

ZynqMp - avoid redefinition when using USE_BUILTIN_STARTUP. #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2025
Merged

ZynqMp - avoid redefinition when using USE_BUILTIN_STARTUP. #536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions hal/zynq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
Loading