altos: Switch to newlib-nano for libc on arm

[fw/altos] / src / lpc / ao_arch.h

diff --git a/src/lpc/ao_arch.h b/src/lpc/ao_arch.h
index dd0debd449925fab5da90df2fbe5d634adc67f7f..f1df14eb61ddb712097940d0558d9d3662dd06db 100644 (file)
--- a/src/lpc/ao_arch.h
+++ b/src/lpc/ao_arch.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -58,14 +59,6 @@
 
 #define ao_arch_interrupt(n)   /* nothing */
 
-#undef putchar
-#undef getchar
-#define putchar(c)     ao_putchar(c)
-#define getchar                ao_getchar
-
-extern void putchar(char c);
-extern char getchar(void);
-
 /*
  * ao_romconfig.c
  */
@@ -130,16 +123,20 @@ ao_serial_init(void);
 /* SPI definitions */
 
 #define AO_SPI_SPEED_12MHz             4
+#define AO_SPI_SPEED_8MHz              6
 #define AO_SPI_SPEED_6MHz              8
 #define AO_SPI_SPEED_4MHz              12
 #define AO_SPI_SPEED_2MHz              24
 #define AO_SPI_SPEED_1MHz              48
 #define AO_SPI_SPEED_500kHz            96
 #define AO_SPI_SPEED_250kHz            192
+#define AO_SPI_SPEED_125kHz            384
+#define AO_SPI_SPEED_62500Hz           768
 
 #define AO_SPI_SPEED_FAST      AO_SPI_SPEED_12MHz
 
 #define AO_BOOT_APPLICATION_BASE       ((uint32_t *) 0x00001000)
+#define AO_BOOT_APPLICATION_BOUND      ((uint32_t *) (0x00000000 + 32 * 1024))
 #define AO_BOOT_LOADER_BASE            ((uint32_t *) 0x00000000)
 #define HAS_BOOT_LOADER                        1