diff --git a/lib/bsp/standalone/data/standalone.tcl b/lib/bsp/standalone/data/standalone.tcl index d13d5502..e0a13e1a 100644 --- a/lib/bsp/standalone/data/standalone.tcl +++ b/lib/bsp/standalone/data/standalone.tcl @@ -96,14 +96,17 @@ proc generate {os_handle} { } "psu_cortexa53" { set procdrv [hsi::get_sw_processor] - set ccdir "./src/cortexa53/gcc" - foreach entry [glob -nocomplain [file join $cortexa53srcdir *]] { + set ccdir "./src/cortexa53/64bit/gcc" + set includedir "./src/cortexa53/includes_ps" + set cortexa53srcdir64 "./src/cortexa53/64bit" + foreach entry [glob -nocomplain [file join $cortexa53srcdir64 *]] { file copy -force $entry "./src/" } foreach entry [glob -nocomplain [file join $ccdir *]] { file copy -force $entry "./src/" } + file copy -force $includedir "./src/" file delete -force "./src/gcc" file delete -force "./src/profile" if { $enable_sw_profile == "true" } { diff --git a/lib/bsp/standalone/src/cortexa53/gcc/Makefile b/lib/bsp/standalone/src/cortexa53/64bit/gcc/Makefile similarity index 98% rename from lib/bsp/standalone/src/cortexa53/gcc/Makefile rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/Makefile index 7f051ce5..d011ff22 100644 --- a/lib/bsp/standalone/src/cortexa53/gcc/Makefile +++ b/lib/bsp/standalone/src/cortexa53/64bit/gcc/Makefile @@ -56,7 +56,7 @@ INCLUDES=-I./. -I${INCLUDEDIR} OUTS = *.o INCLUDEFILES=*.h - +INCLUDEFILES+=includes_ps/*.h libs: $(LIBS) standalone_libs: $(LIBSOURCES) diff --git a/lib/bsp/standalone/src/cortexa53/gcc/_exit.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/_exit.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/_exit.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/_exit.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/_open.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/_open.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/_open.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/_open.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/_sbrk.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/_sbrk.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/_sbrk.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/_sbrk.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/abort.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/abort.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/abort.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/abort.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/asm_vectors.S b/lib/bsp/standalone/src/cortexa53/64bit/gcc/asm_vectors.S similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/asm_vectors.S rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/asm_vectors.S diff --git a/lib/bsp/standalone/src/cortexa53/gcc/boot.S b/lib/bsp/standalone/src/cortexa53/64bit/gcc/boot.S similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/boot.S rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/boot.S diff --git a/lib/bsp/standalone/src/cortexa53/gcc/close.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/close.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/close.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/close.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/errno.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/errno.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/errno.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/errno.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/fcntl.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/fcntl.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/fcntl.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/fcntl.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/fstat.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/fstat.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/fstat.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/fstat.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/getpid.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/getpid.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/getpid.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/getpid.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/initialise_monitor_handles.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/initialise_monitor_handles.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/initialise_monitor_handles.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/initialise_monitor_handles.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/isatty.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/isatty.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/isatty.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/isatty.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/kill.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/kill.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/kill.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/kill.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/lseek.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/lseek.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/lseek.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/lseek.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/open.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/open.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/open.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/open.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/read.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/read.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/read.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/read.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/sbrk.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/sbrk.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/sbrk.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/sbrk.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/translation_table.s b/lib/bsp/standalone/src/cortexa53/64bit/gcc/translation_table.s similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/translation_table.s rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/translation_table.s diff --git a/lib/bsp/standalone/src/cortexa53/gcc/unlink.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/unlink.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/unlink.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/unlink.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/write.c b/lib/bsp/standalone/src/cortexa53/64bit/gcc/write.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/write.c rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/write.c diff --git a/lib/bsp/standalone/src/cortexa53/gcc/xil-crt0.S b/lib/bsp/standalone/src/cortexa53/64bit/gcc/xil-crt0.S similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/xil-crt0.S rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/xil-crt0.S diff --git a/lib/bsp/standalone/src/cortexa53/gcc/xpseudo_asm_gcc.h b/lib/bsp/standalone/src/cortexa53/64bit/gcc/xpseudo_asm_gcc.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/gcc/xpseudo_asm_gcc.h rename to lib/bsp/standalone/src/cortexa53/64bit/gcc/xpseudo_asm_gcc.h diff --git a/lib/bsp/standalone/src/cortexa53/print.c b/lib/bsp/standalone/src/cortexa53/64bit/print.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/print.c rename to lib/bsp/standalone/src/cortexa53/64bit/print.c diff --git a/lib/bsp/standalone/src/cortexa53/putnum.c b/lib/bsp/standalone/src/cortexa53/64bit/putnum.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/putnum.c rename to lib/bsp/standalone/src/cortexa53/64bit/putnum.c diff --git a/lib/bsp/standalone/src/cortexa53/sleep.c b/lib/bsp/standalone/src/cortexa53/64bit/sleep.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/sleep.c rename to lib/bsp/standalone/src/cortexa53/64bit/sleep.c diff --git a/lib/bsp/standalone/src/cortexa53/sleep.h b/lib/bsp/standalone/src/cortexa53/64bit/sleep.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/sleep.h rename to lib/bsp/standalone/src/cortexa53/64bit/sleep.h diff --git a/lib/bsp/standalone/src/cortexa53/uart.c b/lib/bsp/standalone/src/cortexa53/64bit/uart.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/uart.c rename to lib/bsp/standalone/src/cortexa53/64bit/uart.c diff --git a/lib/bsp/standalone/src/cortexa53/usleep.c b/lib/bsp/standalone/src/cortexa53/64bit/usleep.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/usleep.c rename to lib/bsp/standalone/src/cortexa53/64bit/usleep.c diff --git a/lib/bsp/standalone/src/cortexa53/vectors.c b/lib/bsp/standalone/src/cortexa53/64bit/vectors.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/vectors.c rename to lib/bsp/standalone/src/cortexa53/64bit/vectors.c diff --git a/lib/bsp/standalone/src/cortexa53/vectors.h b/lib/bsp/standalone/src/cortexa53/64bit/vectors.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/vectors.h rename to lib/bsp/standalone/src/cortexa53/64bit/vectors.h diff --git a/lib/bsp/standalone/src/cortexa53/xil_cache.c b/lib/bsp/standalone/src/cortexa53/64bit/xil_cache.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_cache.c rename to lib/bsp/standalone/src/cortexa53/64bit/xil_cache.c diff --git a/lib/bsp/standalone/src/cortexa53/xil_cache.h b/lib/bsp/standalone/src/cortexa53/64bit/xil_cache.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_cache.h rename to lib/bsp/standalone/src/cortexa53/64bit/xil_cache.h diff --git a/lib/bsp/standalone/src/cortexa53/xil_exception.c b/lib/bsp/standalone/src/cortexa53/64bit/xil_exception.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_exception.c rename to lib/bsp/standalone/src/cortexa53/64bit/xil_exception.c diff --git a/lib/bsp/standalone/src/cortexa53/xil_exception.h b/lib/bsp/standalone/src/cortexa53/64bit/xil_exception.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_exception.h rename to lib/bsp/standalone/src/cortexa53/64bit/xil_exception.h diff --git a/lib/bsp/standalone/src/cortexa53/xil_io.c b/lib/bsp/standalone/src/cortexa53/64bit/xil_io.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_io.c rename to lib/bsp/standalone/src/cortexa53/64bit/xil_io.c diff --git a/lib/bsp/standalone/src/cortexa53/xil_io.h b/lib/bsp/standalone/src/cortexa53/64bit/xil_io.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_io.h rename to lib/bsp/standalone/src/cortexa53/64bit/xil_io.h diff --git a/lib/bsp/standalone/src/cortexa53/xil_mmu.c b/lib/bsp/standalone/src/cortexa53/64bit/xil_mmu.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_mmu.c rename to lib/bsp/standalone/src/cortexa53/64bit/xil_mmu.c diff --git a/lib/bsp/standalone/src/cortexa53/xil_mmu.h b/lib/bsp/standalone/src/cortexa53/64bit/xil_mmu.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_mmu.h rename to lib/bsp/standalone/src/cortexa53/64bit/xil_mmu.h diff --git a/lib/bsp/standalone/src/cortexa53/xil_printf.c b/lib/bsp/standalone/src/cortexa53/64bit/xil_printf.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_printf.c rename to lib/bsp/standalone/src/cortexa53/64bit/xil_printf.c diff --git a/lib/bsp/standalone/src/cortexa53/xil_printf.h b/lib/bsp/standalone/src/cortexa53/64bit/xil_printf.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xil_printf.h rename to lib/bsp/standalone/src/cortexa53/64bit/xil_printf.h diff --git a/lib/bsp/standalone/src/cortexa53/xparameters_ps.h b/lib/bsp/standalone/src/cortexa53/64bit/xparameters_ps.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xparameters_ps.h rename to lib/bsp/standalone/src/cortexa53/64bit/xparameters_ps.h diff --git a/lib/bsp/standalone/src/cortexa53/xpseudo_asm.h b/lib/bsp/standalone/src/cortexa53/64bit/xpseudo_asm.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xpseudo_asm.h rename to lib/bsp/standalone/src/cortexa53/64bit/xpseudo_asm.h diff --git a/lib/bsp/standalone/src/cortexa53/xreg_cortexa53.h b/lib/bsp/standalone/src/cortexa53/64bit/xreg_cortexa53.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xreg_cortexa53.h rename to lib/bsp/standalone/src/cortexa53/64bit/xreg_cortexa53.h diff --git a/lib/bsp/standalone/src/cortexa53/xstatus.h b/lib/bsp/standalone/src/cortexa53/64bit/xstatus.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xstatus.h rename to lib/bsp/standalone/src/cortexa53/64bit/xstatus.h diff --git a/lib/bsp/standalone/src/cortexa53/xtime_l.c b/lib/bsp/standalone/src/cortexa53/64bit/xtime_l.c similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xtime_l.c rename to lib/bsp/standalone/src/cortexa53/64bit/xtime_l.c diff --git a/lib/bsp/standalone/src/cortexa53/xtime_l.h b/lib/bsp/standalone/src/cortexa53/64bit/xtime_l.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xtime_l.h rename to lib/bsp/standalone/src/cortexa53/64bit/xtime_l.h diff --git a/lib/bsp/standalone/src/cortexa53/xddr_xmpu0_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu0_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xddr_xmpu0_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu0_cfg.h diff --git a/lib/bsp/standalone/src/cortexa53/xddr_xmpu1_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu1_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xddr_xmpu1_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu1_cfg.h diff --git a/lib/bsp/standalone/src/cortexa53/xddr_xmpu2_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu2_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xddr_xmpu2_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu2_cfg.h diff --git a/lib/bsp/standalone/src/cortexa53/xddr_xmpu3_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu3_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xddr_xmpu3_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu3_cfg.h diff --git a/lib/bsp/standalone/src/cortexa53/xddr_xmpu4_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu4_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xddr_xmpu4_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu4_cfg.h diff --git a/lib/bsp/standalone/src/cortexa53/xddr_xmpu5_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu5_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xddr_xmpu5_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xddr_xmpu5_cfg.h diff --git a/lib/bsp/standalone/src/cortexa53/xfpd_slcr.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_slcr.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xfpd_slcr.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_slcr.h diff --git a/lib/bsp/standalone/src/cortexa53/xfpd_slcr_secure.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_slcr_secure.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xfpd_slcr_secure.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_slcr_secure.h diff --git a/lib/bsp/standalone/src/cortexa53/xfpd_xmpu_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_xmpu_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xfpd_xmpu_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_xmpu_cfg.h diff --git a/lib/bsp/standalone/src/cortexa53/xfpd_xmpu_sink.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_xmpu_sink.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xfpd_xmpu_sink.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xfpd_xmpu_sink.h diff --git a/lib/bsp/standalone/src/cortexa53/xiou_secure_slcr.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xiou_secure_slcr.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xiou_secure_slcr.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xiou_secure_slcr.h diff --git a/lib/bsp/standalone/src/cortexa53/xiou_slcr.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xiou_slcr.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xiou_slcr.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xiou_slcr.h diff --git a/lib/bsp/standalone/src/cortexa53/xlpd_slcr.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_slcr.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xlpd_slcr.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_slcr.h diff --git a/lib/bsp/standalone/src/cortexa53/xlpd_slcr_secure.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_slcr_secure.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xlpd_slcr_secure.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_slcr_secure.h diff --git a/lib/bsp/standalone/src/cortexa53/xlpd_xppu.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_xppu.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xlpd_xppu.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_xppu.h diff --git a/lib/bsp/standalone/src/cortexa53/xlpd_xppu_sink.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_xppu_sink.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xlpd_xppu_sink.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xlpd_xppu_sink.h diff --git a/lib/bsp/standalone/src/cortexa53/xocm_xmpu_cfg.h b/lib/bsp/standalone/src/cortexa53/includes_ps/xocm_xmpu_cfg.h similarity index 100% rename from lib/bsp/standalone/src/cortexa53/xocm_xmpu_cfg.h rename to lib/bsp/standalone/src/cortexa53/includes_ps/xocm_xmpu_cfg.h