Merge from trunk

2014-07-10 11:09:09 +00:00
parent 73f75895bc
commit 818cb2bcd7
54 changed files with 3647 additions and 1000 deletions
--- a/sys/driver_mem.c
+++ b/sys/driver_mem.c
@@ -18,10 +18,14 @@
 #include "usb.h"
 #include "exceptions.h"		/* set_ipl() */

-#if MACHINE_FIREBEE
+#if defined(MACHINE_FIREBEE)
 #include "firebee.h"
-#elif MACHINE_M5484LITE
+#elif defined(MACHINE_M5484LITE)
 #include "m5484l.h"
+#elif defined(MACHINE_M54455)
+#include "m54455.h"
+#else
+#error "unknown machine!"
 #endif

 //#define DBG_DM