diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-07 21:49:20 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-07 21:49:20 +0000 |
| commit | c187b50a89e924ec60499c0ae423fc606fe9079b (patch) | |
| tree | e406af66001722476cd7122decd98f3c0756e41f /c/src/lib | |
| parent | 2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-c187b50a89e924ec60499c0ae423fc606fe9079b.tar.bz2 | |
2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* include/bsp.h: Rename poorly named define "M" to "JOEL_M" since
I can't find it used anywhere. When code breaks, someone will
suggest a better name. But "M" conflicted with user code.
* start/start.S: Verify boot_card() is passed a NULL.
Diffstat (limited to 'c/src/lib')
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/include/bsp.h | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/start/start.S | 8 |
3 files changed, 14 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog index 2f316a4663..a81d2b2f51 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog +++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog @@ -1,3 +1,10 @@ +2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com> + + * include/bsp.h: Rename poorly named define "M" to "JOEL_M" since + I can't find it used anywhere. When code breaks, someone will + suggest a better name. But "M" conflicted with user code. + * start/start.S: Verify boot_card() is passed a NULL. + 2009-10-21 Ralf Corsépius <ralf.corsepius@rtems.org> * make/custom/rtl22xx.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h index 99e76efa0b..aa6694278b 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h +++ b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h @@ -85,7 +85,11 @@ extern "C" { #define Fcclk (Fosc << 2) //system freq 2^n time of Fosc(1~32) <=60MHZ #define Fcco (Fcclk <<2) //CCO freq 2,4,8,16 time of Fcclk 156MHz~320MHz #define Fpclk (Fcclk >>2) * 1 //VPB freq only(Fcclk / 4) 1~4 -#define M Fcclk / Fosc +/* This was M. That is a BAD BAD public constant. I renamed it to + * JOEL_M so it wouldn't conflict with user code. If you can find + * a better name, fix this. But nothing I found uses it. + */ +#define JOEL_M Fcclk / Fosc #define P_min Fcco_MIN / (2*Fcclk) + 1; #define P_max Fcco_MAX / (2*Fcclk); diff --git a/c/src/lib/libbsp/arm/rtl22xx/start/start.S b/c/src/lib/libbsp/arm/rtl22xx/start/start.S index c0001eb7b0..651fb6285d 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/start/start.S +++ b/c/src/lib/libbsp/arm/rtl22xx/start/start.S @@ -12,11 +12,6 @@ * $Id$ */ -#warning Call to boot_card has changed and needs checking. -#warning The call is "void boot_card(const char* cmdline);" -#warning You need to pass a NULL. -#warning Please check and remove these warnings. - /* Some standard definitions...*/ /* Some standard definitions...*/ @@ -104,8 +99,9 @@ _bss_init: blo _bss_init /* loop while r0 < r1 */ -#ifdef __thumb__ /* Now we are prepared to start the BSP's C code */ + mov r0, #0 +#ifdef __thumb__ ldr r3, =boot_card bx r3 #else |