interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zy1000: allow it to build on linux host for testing purposes 

For testing and checking the build this can be useful,
it doesn't have any practical application outside development.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe 2010-03-04 19:03:26 +01:00
parent 4af724df23
commit e736468b0e
2 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/jtag/zy1000/jtag_minidriver.h
View File

@ -17,14 +17,14 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <cyg/hal/hal_io.h> // low level i/o
#include <cyg/hal/hal_intr.h> // low level i/o
//#define VERBOSE(a) a
#define VERBOSE(a)
/* used to test manual mode */ /* used to test manual mode */
#define TEST_MANUAL() 0 #define TEST_MANUAL() 0
#define VERBOSE(a)
#if BUILD_ECOSBOARD
#include <cyg/hal/hal_io.h> // low level i/o
#include <cyg/hal/hal_intr.h> // low level i/o
#if 0 #if 0
int diag_printf(const char *fmt, ...); int diag_printf(const char *fmt, ...);
@ -35,10 +35,20 @@ int diag_printf(const char *fmt, ...);
#define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b) #define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b)
#endif #endif
#else
/* redirect this to TCP/IP */
#define ZY1000_PEEK(a, b) b = 1;
#define ZY1000_POKE(a, b)
#endif
// FIFO empty? // FIFO empty?
static __inline__ void waitIdle(void) static __inline__ void waitIdle(void)
{ {
cyg_uint32 empty; uint32_t empty;
do do
{ {
ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
@ -53,7 +63,7 @@ static __inline__ void waitQueue(void)
static __inline__ void sampleShiftRegister(void) static __inline__ void sampleShiftRegister(void)
{ {
#if 0 #if 0
cyg_uint32 dummy; uint32_t dummy;
waitIdle(); waitIdle();
ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, dummy); ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, dummy);
#endif #endif
@ -61,7 +71,7 @@ static __inline__ void sampleShiftRegister(void)
static __inline__ void setCurrentState(enum tap_state state) static __inline__ void setCurrentState(enum tap_state state)
{ {
cyg_uint32 a; uint32_t a;
a = state; a = state;
int repeat = 0; int repeat = 0;
if (state == TAP_RESET) if (state == TAP_RESET)
@ -82,9 +92,9 @@ static __inline__ void setCurrentState(enum tap_state state)
* Enter state and cause repeat transitions *out* of that state. So if the endState != state, then * Enter state and cause repeat transitions *out* of that state. So if the endState != state, then
* the transition from state to endState counts as a transition out of state. * the transition from state to endState counts as a transition out of state.
*/ */
static __inline__ void shiftValueInner(const enum tap_state state, const enum tap_state endState, int repeat, cyg_uint32 value) static __inline__ void shiftValueInner(const enum tap_state state, const enum tap_state endState, int repeat, uint32_t value)
{ {
cyg_uint32 a,b; uint32_t a,b;
a = state; a = state;
b = endState; b = endState;
waitQueue(); waitQueue();

40
src/jtag/zy1000/zy1000.c
View File

@ -48,13 +48,15 @@
#include <target/embeddedice.h> #include <target/embeddedice.h>
#include <jtag/minidriver.h> #include <jtag/minidriver.h>
#include <jtag/interface.h> #include <jtag/interface.h>
#include <time.h>
#if BUILD_ECOSBOARD
#include "zy1000_version.h" #include "zy1000_version.h"
#include <cyg/hal/hal_io.h> // low level i/o #include <cyg/hal/hal_io.h> // low level i/o
#include <cyg/hal/hal_diag.h> #include <cyg/hal/hal_diag.h>
#include <time.h>
#ifdef CYGPKG_HAL_NIOS2 #ifdef CYGPKG_HAL_NIOS2
#include <cyg/hal/io.h> #include <cyg/hal/io.h>
#include <cyg/firmwareutil/firmwareutil.h> #include <cyg/firmwareutil/firmwareutil.h>
@ -66,6 +68,7 @@
#define ZYLIN_OPENOCD GIT_OPENOCD_VERSION #define ZYLIN_OPENOCD GIT_OPENOCD_VERSION
#define ZYLIN_OPENOCD_VERSION "ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE #define ZYLIN_OPENOCD_VERSION "ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE
#endif
static int zy1000_khz(int khz, int *jtag_speed) static int zy1000_khz(int khz, int *jtag_speed)
{ {
@ -96,7 +99,7 @@ static int zy1000_speed_div(int speed, int *khz)
static bool readPowerDropout(void) static bool readPowerDropout(void)
{ {
cyg_uint32 state; uint32_t state;
// sample and clear power dropout // sample and clear power dropout
ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x80); ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x80);
ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state); ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
@ -108,7 +111,7 @@ static bool readPowerDropout(void)
static bool readSRST(void) static bool readSRST(void)
{ {
cyg_uint32 state; uint32_t state;
// sample and clear SRST sensing // sample and clear SRST sensing
ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000040); ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000040);
ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state); ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
@ -260,6 +263,7 @@ COMMAND_HANDLER(handle_power_command)
} }
#if BUILD_ECOSBOARD
/* Give TELNET a way to find out what version this is */ /* Give TELNET a way to find out what version this is */
static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{ {
@ -308,7 +312,7 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
* and actual FPGA * and actual FPGA
*/ */
static char *fpga_id = "0x12345678 0x12345678 0x12345678 0x12345678"; static char *fpga_id = "0x12345678 0x12345678 0x12345678 0x12345678";
cyg_uint32 id, timestamp; uint32_t id, timestamp;
HAL_READ_UINT32(SYSID_BASE, id); HAL_READ_UINT32(SYSID_BASE, id);
HAL_READ_UINT32(SYSID_BASE+4, timestamp); HAL_READ_UINT32(SYSID_BASE+4, timestamp);
sprintf(fpga_id, "0x%08x 0x%08x 0x%08x 0x%08x", id, timestamp, SYSID_ID, SYSID_TIMESTAMP); sprintf(fpga_id, "0x%08x 0x%08x 0x%08x 0x%08x", id, timestamp, SYSID_ID, SYSID_TIMESTAMP);
@ -333,7 +337,7 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
return JIM_OK; return JIM_OK;
} }
#endif
#ifdef CYGPKG_HAL_NIOS2 #ifdef CYGPKG_HAL_NIOS2
@ -353,7 +357,7 @@ static void report_info(void *data, const char * format, va_list args)
struct cyg_upgrade_info firmware_info = struct cyg_upgrade_info firmware_info =
{ {
(cyg_uint8 *)0x84000000, (uint8_t *)0x84000000,
"/ram/firmware.phi", "/ram/firmware.phi",
"Firmware", "Firmware",
0x0300000, 0x0300000,
@ -401,7 +405,7 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
return JIM_ERR; return JIM_ERR;
} }
cyg_uint32 status; uint32_t status;
ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, status); ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, status);
Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80) != 0)); Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80) != 0));
@ -414,7 +418,9 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
int zy1000_init(void) int zy1000_init(void)
{ {
#if BUILD_ECOSBOARD
LOG_USER("%s", ZYLIN_OPENOCD_VERSION); LOG_USER("%s", ZYLIN_OPENOCD_VERSION);
#endif
ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x30); // Turn on LED1 & LED2 ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x30); // Turn on LED1 & LED2
@ -438,7 +444,7 @@ int zy1000_quit(void)
int interface_jtag_execute_queue(void) int interface_jtag_execute_queue(void)
{ {
cyg_uint32 empty; uint32_t empty;
waitIdle(); waitIdle();
ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
@ -460,18 +466,18 @@ int interface_jtag_execute_queue(void)
static cyg_uint32 getShiftValue(void) static uint32_t getShiftValue(void)
{ {
cyg_uint32 value; uint32_t value;
waitIdle(); waitIdle();
ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, value); ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, value);
VERBOSE(LOG_INFO("getShiftValue %08x", value)); VERBOSE(LOG_INFO("getShiftValue %08x", value));
return value; return value;
} }
#if 0 #if 0
static cyg_uint32 getShiftValueFlip(void) static uint32_t getShiftValueFlip(void)
{ {
cyg_uint32 value; uint32_t value;
waitIdle(); waitIdle();
ZY1000_PEEK(ZY1000_JTAG_BASE + 0x18, value); ZY1000_PEEK(ZY1000_JTAG_BASE + 0x18, value);
VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value)); VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value));
@ -480,10 +486,10 @@ static cyg_uint32 getShiftValueFlip(void)
#endif #endif
#if 0 #if 0
static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endState, int repeat, cyg_uint32 value) static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endState, int repeat, uint32_t value)
{ {
VERBOSE(LOG_INFO("shiftValueInner %s %s %d %08x (flipped)", tap_state_name(state), tap_state_name(endState), repeat, value)); VERBOSE(LOG_INFO("shiftValueInner %s %s %d %08x (flipped)", tap_state_name(state), tap_state_name(endState), repeat, value));
cyg_uint32 a,b; uint32_t a,b;
a = state; a = state;
b = endState; b = endState;
ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value); ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
@ -511,7 +517,7 @@ static __inline void scanBits(const uint8_t *out_value, uint8_t *in_value, int n
// we have (num_bits + 7)/8 bytes of bits to toggle out. // we have (num_bits + 7)/8 bytes of bits to toggle out.
// bits are pushed out LSB to MSB // bits are pushed out LSB to MSB
cyg_uint32 value; uint32_t value;
value = 0; value = 0;
if (out_value != NULL) if (out_value != NULL)
{ {
@ -953,6 +959,7 @@ static const struct command_registration zy1000_commands[] = {
"With no arguments, prints status.", "With no arguments, prints status.",
.usage = "('on'|'off)", .usage = "('on'|'off)",
}, },
#if BUILD_ECOSBOARD
{ {
.name = "zy1000_version", .name = "zy1000_version",
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
@ -960,6 +967,7 @@ static const struct command_registration zy1000_commands[] = {
.help = "Print version info for zy1000.", .help = "Print version info for zy1000.",
.usage = "['openocd'|'zy1000'|'date'|'time'|'pcb'|'fpga']", .usage = "['openocd'|'zy1000'|'date'|'time'|'pcb'|'fpga']",
}, },
#endif
{ {
.name = "powerstatus", .name = "powerstatus",
.mode = COMMAND_ANY, .mode = COMMAND_ANY,