This is an automated email from Gerrit. "Michael Mazlin <mmich...@marvell.com>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9100
-- gerrit commit d6461cdb6b6944a5f050b1f1e99b2b867b0da402 Author: Michael Mazlin <michael_maz...@hotmail.com> Date: Fri Aug 29 13:32:00 2025 -0700 Changes to OpenOCD files to add OlympusA Change-Id: I10daf18cde212fa12f6a9d2a2f22be8a6be72fad Signed-off-by: Michael Mazlin <michael_maz...@hotmail.com> diff --git a/configure.ac b/configure.ac index b508f2ade9..6b0157e21a 100644 --- a/configure.ac +++ b/configure.ac @@ -216,6 +216,9 @@ m4_define([HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS], m4_define([DUMMY_ADAPTER], [[[dummy], [Dummy Adapter], [DUMMY]]]) +m4_define([OLYMPUS_ADAPTERS], + [[[olympusa], [OlympusA JTAG Debugger], [OLYMPUSA]]]) + m4_define([OPTIONAL_LIBRARIES], [[[capstone], [Use Capstone disassembly framework], []]]) @@ -327,7 +330,8 @@ AC_ARG_ADAPTERS([ JTAG_VPI_ADAPTER, RSHIM_ADAPTER, XVC_ADAPTERS, - LIBJAYLINK_ADAPTERS + LIBJAYLINK_ADAPTERS, + OLYMPUS_ADAPTERS ],[auto]) AC_ARG_ADAPTERS([ @@ -487,6 +491,12 @@ AS_IF([test "x$ADAPTER_VAR([dummy])" != "xno"], [ build_bitbang=yes ]) +AS_IF([test "x$build_olympusa" = "xyes"], [ + AC_DEFINE([BUILD_OLYMPUSA], [1], [1 if you want OlympusA.]) +], [ + AC_DEFINE([BUILD_OLYMPUSA], [0], [0 if you don't want OlympusA.]) +]) + AS_IF([test "x$parport_use_ppdev" = "xyes"], [ AC_DEFINE([PARPORT_USE_PPDEV], [1], [1 if you want parport to use ppdev.]) ], [ @@ -639,6 +649,7 @@ PROCESS_ADAPTERS([AMTJTAGACCEL_ADAPTER], [true], [unused]) PROCESS_ADAPTERS([HOST_ARM_BITBANG_ADAPTERS], [true], [unused]) PROCESS_ADAPTERS([HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS], [true], [unused]) PROCESS_ADAPTERS([DUMMY_ADAPTER], [true], [unused]) +PROCESS_ADAPTERS([OLYMPUS_ADAPTERS], [true], [unused]) AS_IF([test "x$enable_linuxgpiod" != "xno"], [ build_bitbang=yes @@ -833,6 +844,7 @@ m4_foreach([adapterTuple], [USB1_ADAPTERS, HOST_ARM_BITBANG_ADAPTERS, HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS, DUMMY_ADAPTER, + OLYMPUS_ADAPTERS, OPTIONAL_LIBRARIES, COVERAGE], [s=m4_format(["%-49s"], ADAPTER_DESC([adapterTuple])) diff --git a/doc/openocd.texi b/doc/openocd.texi index 4d8f795582..c7e42e7326 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -637,6 +637,9 @@ This is deprecated from Linux v5.3; prefer using @b{linuxgpiod}. @* A JTAG driver that works with the WCH CH347F and CH347T chips. When using the CH347T, it must be configured to operate in mode 3 (UART + JTAG). +@item @b{olympusa} +@* A JTAG driver that works with Marvell Olympus system. + @end itemize @node About Jim Tcl @@ -2619,6 +2622,10 @@ ch347 activity_led n4 @end deffn @end deffn +@deffn {Interface Driver} {olympusa} +This is the Marvell Olympus based JTAG Adapter. +@end deffn + @deffn {Interface Driver} {cmsis-dap} ARM CMSIS-DAP compliant based adapter v1 (USB HID based) or v2 (USB bulk). diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 3a3fe07724..74db3b9603 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -211,6 +211,10 @@ endif if CH347 DRIVERFILES += %D%/ch347.c endif +if OLYMPUSA +DRIVERFILES += %D%/OlympusA/OlympusA.c +%C%_libocdjtagdrivers_la_LIBADD += -L%D%/OlympusA -lInphiOlympus64 +endif DRIVERHEADERS = \ %D%/bitbang.h \ diff --git a/src/jtag/interface.h b/src/jtag/interface.h index 51cbf9ac0d..e05a008d3f 100644 --- a/src/jtag/interface.h +++ b/src/jtag/interface.h @@ -396,6 +396,7 @@ extern struct adapter_driver jtag_vpi_adapter_driver; extern struct adapter_driver kitprog_adapter_driver; extern struct adapter_driver linuxgpiod_adapter_driver; extern struct adapter_driver linuxspidev_adapter_driver; +extern struct adapter_driver olympusa_adapter_driver; extern struct adapter_driver opendous_adapter_driver; extern struct adapter_driver openjtag_adapter_driver; extern struct adapter_driver osbdm_adapter_driver; diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c index e29937b587..a49a82de33 100644 --- a/src/jtag/interfaces.c +++ b/src/jtag/interfaces.c @@ -110,6 +110,9 @@ struct adapter_driver *adapter_drivers[] = { #if BUILD_LINUXSPIDEV == 1 &linuxspidev_adapter_driver, #endif +#if BUILD_OLYMPUSA == 1 + &olympusa_adapter_driver, +#endif #if BUILD_OPENDOUS == 1 &opendous_adapter_driver, #endif --