From 5eac085310134eff3c680999600aed49d5280eea Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 28 Jul 2009 14:34:45 +0000 Subject: 2009-07-28 Xi Yang * configure.ac: undefine BSP_PRESS_KEY_FOR_RESET * startup/bspreset.c, include/ep7312.h: Support skyeye shutdown device --- c/src/lib/libbsp/arm/edb7312/ChangeLog | 5 +++++ c/src/lib/libbsp/arm/edb7312/configure.ac | 2 +- c/src/lib/libbsp/arm/edb7312/include/ep7312.h | 3 +++ c/src/lib/libbsp/arm/edb7312/startup/bspreset.c | 11 ++++++----- 4 files changed, 15 insertions(+), 6 deletions(-) (limited to 'c/src/lib/libbsp/arm') diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 4e095e676b..4848c63063 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,8 @@ +2009-07-28 Xi Yang + + * configure.ac: undefine BSP_PRESS_KEY_FOR_RESET + * startup/bspreset.c, include/ep7312.h: Support skyeye shutdown device + 2009-07-16 Joel Sherrill * configure.ac: Rename BSP_BOOTCARD_OPTIONS to diff --git a/c/src/lib/libbsp/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac index 70c5b5cbb7..e0a4958ebd 100644 --- a/c/src/lib/libbsp/arm/edb7312/configure.ac +++ b/c/src/lib/libbsp/arm/edb7312/configure.ac @@ -26,7 +26,7 @@ RTEMS_BSPOPTS_HELP([ON_SKYEYE], the wall time required to execute the RTEMS test suites.]) RTEMS_BSP_BOOTCARD_OPTIONS -RTEMS_BSP_CLEANUP_OPTIONS(1, 1) +RTEMS_BSP_CLEANUP_OPTIONS(0, 1) # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) diff --git a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h b/c/src/lib/libbsp/arm/edb7312/include/ep7312.h index 13bcc3b7bf..dcc8c93f83 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h +++ b/c/src/lib/libbsp/arm/edb7312/include/ep7312.h @@ -153,4 +153,7 @@ /* INTR3 (Interrupt 3) mask/status register bits */ #define EP7312_INTR2_DAIINT 0x00000001 +/*Write to SKYEYE_MAGIC_ADDRESS to make SKYEYE exit*/ + +#define SKYEYE_MAGIC_ADDRESS (*(volatile unsigned int *)(0xb0000000)) #endif /* __EP7312_H__ */ diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c b/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c index f18037e2b6..c9f319228c 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c +++ b/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c @@ -9,12 +9,13 @@ */ #include +#include void bsp_reset(void) { - #if ON_SKYEYE - /* TBD use Skyeye reset device */ - #else - asm volatile ("b _start"); - #endif +#if ON_SKYEYE == 1 + SKYEYE_MAGIC_ADDRESS = 0xff; +#else + asm volatile ("b _start"); +#endif } -- cgit v1.2.3