Skip to content

Commit d6ca1e1

Browse files
dgarskedanielinux
authored andcommitted
Fixes for Raspi and Zynqmp builds.
1 parent 6e39fd1 commit d6ca1e1

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/boot_aarch64_start.S

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222

2323
/* Include target-specific defines here to override any AA64 defaults */
24-
#if defined(TARGET_LS1028A)
24+
#ifdef TARGET_nxp_ls1028a
2525
#include "../hal/nxp_ls1028a.h"
2626
#endif
2727

@@ -280,6 +280,7 @@ init_stack:
280280
bl invalidate_ivac
281281
b boot_entry_C
282282

283+
#ifdef TARGET_nxp_ls1028a
283284
.global mmu_enable
284285
mmu_enable:
285286
tlbi alle3 /* Invalidate table entries */
@@ -317,6 +318,7 @@ mmu_enable:
317318
dsb sy
318319
isb
319320
ret
321+
#endif
320322

321323
/* Exception Vector Table EL3 */
322324
.balign 0x800
@@ -388,6 +390,7 @@ PUT_64BIT_WORD \attr_hi, ((\PA) & 0xc0000000) | \attr_lo | 0x1
388390
PUT_64BIT_WORD \attr_hi, ((\PA) & 0xffe00000) | \attr_lo | 0x1
389391
.endm
390392

393+
#ifdef TARGET_nxp_ls1028a
391394
/* Note: In EL3/2 has direct physical to virutal mapping */
392395
.align 12
393396
.global ttb0_base
@@ -404,3 +407,4 @@ level1_pagetable:
404407
BLOCK_2MB (ADDR << 20), 0, 0x74c
405408
.set ADDR, ADDR + 2
406409
.endr
410+
#endif

0 commit comments

Comments
 (0)