Skip to content
Snippets Groups Projects
Commit 1297aafb authored by oharboe's avatar oharboe
Browse files

nios wip

git-svn-id: svn://svn.berlios.de/openocd/trunk@1165 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 4b7e7eef
No related branches found
No related tags found
No related merge requests found
...@@ -63,16 +63,16 @@ AC_ARG_ENABLE(amtjtagaccel, ...@@ -63,16 +63,16 @@ AC_ARG_ENABLE(amtjtagaccel,
AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]), AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]),
[build_amtjtagaccel=$enableval], [build_amtjtagaccel=no]) [build_amtjtagaccel=$enableval], [build_amtjtagaccel=no])
AC_ARG_ENABLE(ecosboard,
AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCosBoard based JTAG debugger]),
[build_ecosboard=$enableval], [build_ecosboard=no])
case "${host_cpu}" in case "${host_cpu}" in
arm*) arm*)
AC_ARG_ENABLE(ep93xx, AC_ARG_ENABLE(ep93xx,
AS_HELP_STRING([--enable-ep93xx], [Enable building support for EP93xx based SBCs]), AS_HELP_STRING([--enable-ep93xx], [Enable building support for EP93xx based SBCs]),
[build_ep93xx=$enableval], [build_ep93xx=no]) [build_ep93xx=$enableval], [build_ep93xx=no])
AC_ARG_ENABLE(ecosboard,
AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCosBoard based JTAG debugger]),
[build_ecosboard=$enableval], [build_ecosboard=no])
AC_ARG_ENABLE(at91rm9200, AC_ARG_ENABLE(at91rm9200,
AS_HELP_STRING([--enable-at91rm9200], [Enable building support for AT91RM9200 based SBCs]), AS_HELP_STRING([--enable-at91rm9200], [Enable building support for AT91RM9200 based SBCs]),
[build_at91rm9200=$enableval], [build_at91rm9200=no]) [build_at91rm9200=$enableval], [build_at91rm9200=no])
...@@ -81,7 +81,6 @@ case "${host_cpu}" in ...@@ -81,7 +81,6 @@ case "${host_cpu}" in
*) *)
build_ep93xx=no build_ep93xx=no
build_at91rm9200=no build_at91rm9200=no
build_ecosboard=no
;; ;;
esac esac
......
...@@ -797,7 +797,9 @@ void _zylinjtag_diag_write_char(char c, void **param) ...@@ -797,7 +797,9 @@ void _zylinjtag_diag_write_char(char c, void **param)
HAL_DIAG_WRITE_CHAR(c); HAL_DIAG_WRITE_CHAR(c);
} }
#ifdef CYGPKG_HAL_ZYLIN_PHI
printDccChar(c); printDccChar(c);
#endif
} }
#define SHOW_RESULT(a, b) diag_printf(#a " failed %d\n", (int)b) #define SHOW_RESULT(a, b) diag_printf(#a " failed %d\n", (int)b)
...@@ -1358,6 +1360,7 @@ print_exception_handler(cyg_addrword_t data, cyg_code_t exception, cyg_addrword_ ...@@ -1358,6 +1360,7 @@ print_exception_handler(cyg_addrword_t data, cyg_code_t exception, cyg_addrword_
char *infoStr = "unknown"; char *infoStr = "unknown";
switch (exception) switch (exception)
{ {
#ifdef CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION
case CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION: case CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION:
infoStr = "undefined instruction"; infoStr = "undefined instruction";
break; break;
...@@ -1370,6 +1373,7 @@ print_exception_handler(cyg_addrword_t data, cyg_code_t exception, cyg_addrword_ ...@@ -1370,6 +1373,7 @@ print_exception_handler(cyg_addrword_t data, cyg_code_t exception, cyg_addrword_
case CYGNUM_HAL_VECTOR_ABORT_DATA: case CYGNUM_HAL_VECTOR_ABORT_DATA:
infoStr = "abort data"; infoStr = "abort data";
break; break;
#endif
default: default:
break; break;
} }
...@@ -1493,7 +1497,9 @@ zylinjtag_uart(cyg_addrword_t data) ...@@ -1493,7 +1497,9 @@ zylinjtag_uart(cyg_addrword_t data)
continue; continue;
} }
#ifdef CYGPKG_PROFILE_GPROF
start_profile(); start_profile();
#endif
int actual = 0; int actual = 0;
int actual2 = 0; int actual2 = 0;
int pos, pos2; int pos, pos2;
...@@ -1742,9 +1748,11 @@ int main(int argc, char *argv[]) ...@@ -1742,9 +1748,11 @@ int main(int argc, char *argv[])
ramblockdevice=(cyg_uint8 *)malloc(ramblockdevice_size); ramblockdevice=(cyg_uint8 *)malloc(ramblockdevice_size);
memset(ramblockdevice, 0xff, ramblockdevice_size); memset(ramblockdevice, 0xff, ramblockdevice_size);
#ifdef CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION
setHandler(CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION); setHandler(CYGNUM_HAL_VECTOR_UNDEF_INSTRUCTION);
setHandler(CYGNUM_HAL_VECTOR_ABORT_PREFETCH); setHandler(CYGNUM_HAL_VECTOR_ABORT_PREFETCH);
setHandler(CYGNUM_HAL_VECTOR_ABORT_DATA); setHandler(CYGNUM_HAL_VECTOR_ABORT_DATA);
#endif
int err; int err;
err = cyg_io_lookup("/dev/ser0", &serial_handle); err = cyg_io_lookup("/dev/ser0", &serial_handle);
......
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
#include <cyg/hal/hal_io.h> // low level i/o #include <cyg/hal/hal_io.h> // low level i/o
#include <cyg/hal/var_io.h> // common registers
#include <cyg/hal/plf_io.h> // platform registers
#include <cyg/hal/hal_diag.h> #include <cyg/hal/hal_diag.h>
#include <stdlib.h> #include <stdlib.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment