This is an automated email from Gerrit.

Daniel Goehring ([email protected]) just uploaded a new patch set 
to Gerrit, which you can find at http://openocd.zylin.com/6078

-- gerrit

commit 1c28060d7db6be0955eaf7991d4888f00ab896bc
Author: Kevin Burke <[email protected]>
Date:   Wed Feb 24 18:47:56 2021 -0500

    target|adiv5-adiv6: Allows APCSW cfg file setting
    
    dap_instance_init routine preserves user setting from cfg file
    
    Tested on an Ampere eMAG8180 and Quicksilver silicon
    
    Change-Id: I5f8432711ae3a78497ebe8746bc13d758e3aa6b3
    Signed-off-by: Kevin Burke <[email protected]>
    Signed-off-by: Daniel Goehring <[email protected]>

diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c
index f54329e..b86e65a 100644
--- a/src/target/arm_dap.c
+++ b/src/target/arm_dap.c
@@ -60,7 +60,8 @@ static void dap_instance_init(struct adiv5_dap *dap)
                /* Number of bits for tar autoincrement, impl. dep. at least 10 
*/
                dap->ap[i].tar_autoincr_block = (1<<10);
                /* default CSW value */
-               dap->ap[i].csw_default = CSW_AHB_DEFAULT;
+               if (!dap->ap[i].csw_default)
+                       dap->ap[i].csw_default = CSW_AHB_DEFAULT;
                dap->ap[i].cfg_reg = ADI_BAD_CFG; /* mem_ap configuration reg 
(large physical addr, etc. */
        }
        INIT_LIST_HEAD(&dap->cmd_journal);

-- 


_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to