Some parts of code are version specific. It will be easier
if we extract ejtag version and store it some where.
Change-Id: I8f9addc42108cba5ae9d61b8ade8f9d7f02a0fb5
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Reviewed-on: http://openocd.zylin.com/1462
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
int mips_ejtag_init(struct mips_ejtag *ejtag_info)
{
int mips_ejtag_init(struct mips_ejtag *ejtag_info)
{
- uint32_t ejtag_version;
int retval;
retval = mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode);
int retval;
retval = mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode);
LOG_DEBUG("impcode: 0x%8.8" PRIx32 "", ejtag_info->impcode);
/* get ejtag version */
LOG_DEBUG("impcode: 0x%8.8" PRIx32 "", ejtag_info->impcode);
/* get ejtag version */
- ejtag_version = ((ejtag_info->impcode >> 29) & 0x07);
+ ejtag_info->ejtag_version = ((ejtag_info->impcode >> 29) & 0x07);
- switch (ejtag_version) {
- case 0:
+ switch (ejtag_info->ejtag_version) {
+ case EJTAG_VERSION_20:
LOG_DEBUG("EJTAG: Version 1 or 2.0 Detected");
break;
LOG_DEBUG("EJTAG: Version 1 or 2.0 Detected");
break;
LOG_DEBUG("EJTAG: Version 2.5 Detected");
break;
LOG_DEBUG("EJTAG: Version 2.5 Detected");
break;
LOG_DEBUG("EJTAG: Version 2.6 Detected");
break;
LOG_DEBUG("EJTAG: Version 2.6 Detected");
break;
LOG_DEBUG("EJTAG: Version 3.1 Detected");
break;
LOG_DEBUG("EJTAG: Version 3.1 Detected");
break;
LOG_DEBUG("EJTAG: Version 4.1 Detected");
break;
LOG_DEBUG("EJTAG: Version 4.1 Detected");
break;
LOG_DEBUG("EJTAG: Version 5.1 Detected");
break;
default:
LOG_DEBUG("EJTAG: Version 5.1 Detected");
break;
default:
#define EJTAG_DBCn_BLM_SHIFT 4
#define EJTAG_DBCn_BE (1 << 0)
#define EJTAG_DBCn_BLM_SHIFT 4
#define EJTAG_DBCn_BE (1 << 0)
+#define EJTAG_VERSION_20 0
+#define EJTAG_VERSION_25 1
+#define EJTAG_VERSION_26 2
+#define EJTAG_VERSION_31 3
+#define EJTAG_VERSION_41 4
+#define EJTAG_VERSION_51 5
+
struct mips_ejtag {
struct jtag_tap *tap;
uint32_t impcode;
struct mips_ejtag {
struct jtag_tap *tap;
uint32_t impcode;
uint32_t reg9;
unsigned scan_delay;
int mode;
uint32_t reg9;
unsigned scan_delay;
int mode;
+ unsigned int ejtag_version;
};
void mips_ejtag_set_instr(struct mips_ejtag *ejtag_info,
};
void mips_ejtag_set_instr(struct mips_ejtag *ejtag_info,