From: Tomas Vanek Date: Tue, 6 Apr 2021 11:46:07 +0000 (+0200) Subject: target/arm_adi_v5: move DP register definitions to one block X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ab337d05f432465fdfedb694ac862fb22f80d7a6;p=fw%2Fopenocd target/arm_adi_v5: move DP register definitions to one block DP and MEM-AP definitions were mixed. Change-Id: I2f691b2274c01e9090c1e5160c6903d3207e35c2 Signed-off-by: Tomas Vanek Reviewed-on: http://openocd.zylin.com/6138 Tested-by: jenkins --- diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h index 047606c43..00e4ea2b2 100644 --- a/src/target/arm_adi_v5.h +++ b/src/target/arm_adi_v5.h @@ -85,6 +85,15 @@ #define CSYSPWRUPREQ (1UL << 30) #define CSYSPWRUPACK (1UL << 31) +#define DP_SELECT_APSEL 0xFF000000 +#define DP_SELECT_APBANK 0x000000F0 +#define DP_SELECT_DPBANK 0x0000000F +#define DP_SELECT_INVALID 0x00FFFF00 /* Reserved bits one */ + +#define DP_APSEL_MAX (255) +#define DP_APSEL_INVALID (-1) + + /* MEM-AP register addresses */ #define MEM_AP_REG_CSW 0x00 #define MEM_AP_REG_TAR 0x04 @@ -150,14 +159,6 @@ #define IDR_JEP106_ARM 0x04760000 -#define DP_SELECT_APSEL 0xFF000000 -#define DP_SELECT_APBANK 0x000000F0 -#define DP_SELECT_DPBANK 0x0000000F -#define DP_SELECT_INVALID 0x00FFFF00 /* Reserved bits one */ - -#define DP_APSEL_MAX (255) -#define DP_APSEL_INVALID (-1) - /* FIXME: not SWD specific; should be renamed, e.g. adiv5_special_seq */ enum swd_special_seq { LINE_RESET,