diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-01-21 18:38:51 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-01-21 18:38:51 -0600 |
| commit | be4880ebe4355e8782be4af4b337a1b98dffcbe3 (patch) | |
| tree | 8b699181073305221b95f338a2d9107ab1bbfa3f /board/trab | |
| parent | 633639587e3596f0dbf5e6247dd3faf80b1d9063 (diff) | |
| parent | 72d15e705bc3983884105cb7755c7ba80e74a0a5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'board/trab')
| -rw-r--r-- | board/trab/Makefile | 3 | ||||
| -rw-r--r-- | board/trab/memory.c | 6 | ||||
| -rw-r--r-- | board/trab/trab_fkt.c | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/board/trab/Makefile b/board/trab/Makefile index 6dfcb87096..30e5fbbb31 100644 --- a/board/trab/Makefile +++ b/board/trab/Makefile @@ -51,7 +51,8 @@ $(obj)trab_fkt.srec: $(OBJS_FKT) $(LIB) $(LD) -g -Ttext $(LOAD_ADDR) -o $(<:.o=) -e trab_fkt $^ $(LIB) \ -L$(obj)../../examples -lstubs \ -L$(obj)../../lib_generic -lgeneric \ - -L$(gcclibdir) -lgcc + $(obj)../../lib_arm/div0.o \ + $(obj)../../lib_arm/_*.o $(OBJCOPY) -O srec $(<:.o=) $@ $(obj)trab_fkt.bin: $(obj)trab_fkt.srec diff --git a/board/trab/memory.c b/board/trab/memory.c index 8fb3d2c127..895b68ef75 100644 --- a/board/trab/memory.c +++ b/board/trab/memory.c @@ -184,7 +184,7 @@ * * For other processors, let the compiler generate the best code it can. */ -static void move64(unsigned long long *src, unsigned long long *dest) +static void move64(const unsigned long long *src, unsigned long long *dest) { #if defined(CONFIG_MPC8260) || defined(CONFIG_MPC824X) asm ("lfd 0, 0(3)\n\t" /* fpr0 = *scr */ @@ -231,12 +231,12 @@ static int memory_post_dataline(unsigned long long * pmem) int ret = 0; for ( i = 0; i < num_patterns; i++) { - move64((unsigned long long *)&(pattern[i]), pmem++); + move64(&(pattern[i]), pmem++); /* * Put a different pattern on the data lines: otherwise they * may float long enough to read back what we wrote. */ - move64((unsigned long long *)&otherpattern, pmem--); + move64(&otherpattern, pmem--); move64(pmem, &temp64); #ifdef INJECT_DATA_ERRORS diff --git a/board/trab/trab_fkt.c b/board/trab/trab_fkt.c index 7273ef97b6..53cdb5a31e 100644 --- a/board/trab/trab_fkt.c +++ b/board/trab/trab_fkt.c @@ -25,6 +25,7 @@ #include <common.h> #include <exports.h> +#include <timestamp.h> #include <s3c2400.h> #include "tsc2000.h" #include "rs485.h" @@ -293,10 +294,16 @@ int trab_fkt (int argc, char *argv[]) return 1; } +void hang (void) +{ + puts ("### ERROR ### Please RESET the board ###\n"); + for (;;); +} + int do_info (void) { printf ("Stand-alone application for TRAB board function test\n"); - printf ("Built: %s at %s\n", __DATE__ , __TIME__ ); + printf ("Built: %s at %s\n", U_BOOT_DATE, U_BOOT_TIME); return 0; } |