From 8a2c3af9cfaa6863c21c8ce215759e7a528b9e59 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Wed, 27 Sep 2023 11:43:50 -0500 Subject: bsps/xil: Adjust Xilinx support code for Cortex-R5 This fixes some issues in the Xilinx support code that are critical to support the Cortex-R5F cores present in my Xilinx SoCs. The imported Cortex-R5 xil_cache.c matches the existing information in bsps/shared/xil/VERSION. --- spec/build/bsps/objxilinxsupport.yml | 1 - spec/build/bsps/objxilinxsupportilp32.yml | 3 ++- spec/build/bsps/objxilinxsupportlp64.yml | 3 ++- spec/build/bsps/objxilinxsupportr5.yml | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'spec/build/bsps') diff --git a/spec/build/bsps/objxilinxsupport.yml b/spec/build/bsps/objxilinxsupport.yml index d686ae9cfd..f67316ebdb 100644 --- a/spec/build/bsps/objxilinxsupport.yml +++ b/spec/build/bsps/objxilinxsupport.yml @@ -38,7 +38,6 @@ links: - role: build-dependency uid: optxilsupportpath source: -- bsps/shared/xil/xil_cache.c - bsps/shared/xil/xil_assert.c - bsps/shared/xil/xil_mem.c type: build diff --git a/spec/build/bsps/objxilinxsupportilp32.yml b/spec/build/bsps/objxilinxsupportilp32.yml index 2db5d12bef..0fc4fb0f35 100644 --- a/spec/build/bsps/objxilinxsupportilp32.yml +++ b/spec/build/bsps/objxilinxsupportilp32.yml @@ -17,5 +17,6 @@ install: - bsps/include/xil/arm/ARMv8/32bit/xpseudo_asm.h - bsps/include/xil/arm/ARMv8/32bit/xreg_cortexa53.h links: [] -source: [] +source: +- bsps/shared/xil/arm/ARMv8/xil_cache.c type: build diff --git a/spec/build/bsps/objxilinxsupportlp64.yml b/spec/build/bsps/objxilinxsupportlp64.yml index efb2e8d58a..330ffc34fd 100644 --- a/spec/build/bsps/objxilinxsupportlp64.yml +++ b/spec/build/bsps/objxilinxsupportlp64.yml @@ -19,5 +19,6 @@ install: - bsps/include/xil/arm/ARMv8/64bit/xpseudo_asm.h - bsps/include/xil/arm/ARMv8/64bit/xreg_cortexa53.h links: [] -source: [] +source: +- bsps/shared/xil/arm/ARMv8/xil_cache.c type: build diff --git a/spec/build/bsps/objxilinxsupportr5.yml b/spec/build/bsps/objxilinxsupportr5.yml index 4f7fe33606..db402af8ca 100644 --- a/spec/build/bsps/objxilinxsupportr5.yml +++ b/spec/build/bsps/objxilinxsupportr5.yml @@ -14,6 +14,9 @@ install: - bsps/include/xil/arm/cortexr5/xil_exception.h - bsps/include/xil/arm/cortexr5/xpseudo_asm.h - bsps/include/xil/arm/cortexr5/xreg_cortexr5.h + - bsps/include/xil/arm/cortexr5/xil_mpu.h links: [] -source: [] +source: +- bsps/shared/xil/arm/cortexr5/xil_cache.c +- bsps/shared/xil/arm/cortexr5/xil_mpu.c type: build -- cgit v1.2.3