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.

1 files changed, 5 insertions, 1 deletions

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);