GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Wolfgang Denk 2005-09-25 02:00:47 +02:00
parent 74f4304ee7
commit fe7eb5d88b
19 changed files with 149 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
board/integratorap/Makefile
View file

@ -49,4 +49,3 @@ distclean: clean
-include .depend -include .depend
######################################################################### #########################################################################

6
board/integratorap/integratorap.c
View file

@ -557,8 +557,7 @@ void udelay (unsigned long usec)
tmp = get_timer_masked(); /* get current timestamp */ tmp = get_timer_masked(); /* get current timestamp */
tmo += tmp; /* wake up timestamp */ tmo += tmp; /* wake up timestamp */
while (get_timer_masked () < tmo)/* loop till event */ while (get_timer_masked () < tmo) { /* loop till event */
{
/*NOP*/; /*NOP*/;
} }
} }
@ -578,8 +577,7 @@ ulong get_timer_masked (void)
{ {
ulong now = READ_TIMER; /* current count */ ulong now = READ_TIMER; /* current count */
if(now > lastdec) if (now > lastdec) {
{
/* Must have wrapped */ /* Must have wrapped */
total_count += lastdec + TIMER_LOAD_VAL + 1 - now; total_count += lastdec + TIMER_LOAD_VAL + 1 - now;
} else { } else {

1
board/integratorap/memsetup.S
View file

@ -27,4 +27,3 @@
.globl memsetup .globl memsetup
memsetup: memsetup:
mov pc,lr mov pc,lr

1
board/integratorap/platform.S
View file

@ -42,4 +42,3 @@ reset_cpu:
reset_failed: reset_failed:
b reset_failed b reset_failed

6
board/integratorcp/integratorcp.c
View file

@ -219,8 +219,7 @@ void udelay (unsigned long usec)
tmp = get_timer_masked(); /* get current timestamp */ tmp = get_timer_masked(); /* get current timestamp */
tmo += tmp; /* form target timestamp */ tmo += tmp; /* form target timestamp */
while (get_timer_masked () < tmo)/* loop till event */ while (get_timer_masked () < tmo) {/* loop till event */
{
/*NOP*/; /*NOP*/;
} }
} }
@ -240,8 +239,7 @@ ulong get_timer_masked (void)
/* get current count */ /* get current count */
unsigned long long now = (unsigned long long)READ_TIMER; unsigned long long now = (unsigned long long)READ_TIMER;
if(now > lastdec) if(now > lastdec) {
{
/* Must have wrapped */ /* Must have wrapped */
total_count += lastdec + TIMER_LOAD_VAL + 1 - now; total_count += lastdec + TIMER_LOAD_VAL + 1 - now;
} else { } else {

1
board/integratorcp/memsetup.S
View file

@ -27,4 +27,3 @@
.globl memsetup .globl memsetup
memsetup: memsetup:
mov pc,lr mov pc,lr

1
board/integratorcp/platform.S
View file

@ -211,4 +211,3 @@ copy_vec:
ldmfd r13!,{r4-r10,pc} /* back to caller */ ldmfd r13!,{r4-r10,pc} /* back to caller */
#endif /* #ifdef CONFIG_CM_REMAP */ #endif /* #ifdef CONFIG_CM_REMAP */

1
cpu/arm926ejs/start.S
View file

@ -414,4 +414,3 @@ rstctl1:
.word 0xfffece10 .word 0xfffece10
#endif /* #ifdef CONFIG_INTEGRATOR */ #endif /* #ifdef CONFIG_INTEGRATOR */

1
cpu/arm946es/Makefile
View file

@ -41,4 +41,3 @@ $(LIB): $(OBJS)
sinclude .depend sinclude .depend
######################################################################### #########################################################################

1
cpu/arm946es/cpu.c
View file

@ -161,4 +161,3 @@ int icache_status (void)
{ {
return (read_p15_c1 () & C1_IC) != 0; return (read_p15_c1 () & C1_IC) != 0;
} }

3
doc/README-integrator
View file

@ -61,6 +61,3 @@ of the Integrator board itself, has been placed in
board/integrator<>/platform.S board/integrator<>/platform.S
board/integrator<>/integrator<>.c board/integrator<>/integrator<>.c