Reverse merge from trunk in pci_BaS_gcc branch

2014-07-10 13:20:14 +00:00
parent 818cb2bcd7
commit b0617246e2
54 changed files with 1006 additions and 3653 deletions
--- a/sys/driver_mem.c
+++ b/sys/driver_mem.c
@@ -18,14 +18,10 @@
 #include "usb.h"
 #include "exceptions.h"		/* set_ipl() */

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

 //#define DBG_DM