altos: Clean up AO_ROMCONFIG bits

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

diff --git a/src/stmf0/ao_arch.h b/src/stmf0/ao_arch.h
index c5f451f59aff32d304a8640da9395c949b3df441..22e706b2a975bca6cdb24b210dfbfc56ac52bf32 100644 (file)
--- a/src/stmf0/ao_arch.h
+++ b/src/stmf0/ao_arch.h
@@ -43,11 +43,6 @@
 
 #define ao_arch_naked_declare  __attribute__((naked))
 #define ao_arch_naked_define
-#define __pdata
-#define __data
-#define __xdata
-#define __code const
-#define __reentrant
 #define __interrupt(n)
 #define __at(n)
 
@@ -59,23 +54,11 @@
 
 #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);
-extern void ao_avr_stdio_init(void);
-
-
 /*
  * ao_romconfig.c
  */
 
-#define AO_ROMCONFIG_VERSION   2
-
-#define AO_ROMCONFIG_SYMBOL(a) __attribute__((section(".romconfig"))) const
+#define AO_ROMCONFIG_SYMBOL __attribute__((section(".romconfig"))) const
 
 extern const uint16_t ao_romconfig_version;
 extern const uint16_t ao_romconfig_check;
@@ -94,13 +77,18 @@ extern const uint32_t ao_radio_cal;
  * For the stm32f042, we want to use the USB-based HSI48 clock
  */
 
-#if AO_HSI48
+#ifndef AO_SYSCLK
+#if AO_HSI
+#define AO_SYSCLK      STM_HSI_FREQ
+#endif
 
+#if AO_HSI48
 #define AO_SYSCLK      48000000
-#define AO_HCLK                (AO_SYSCLK / AO_AHB_PRESCALER)
-
+#endif
 #endif
 
+#define AO_HCLK                (AO_SYSCLK / AO_AHB_PRESCALER)
+
 #if AO_HSE || AO_HSI
 
 #if AO_HSE
@@ -150,7 +138,9 @@ ao_adc_init();
 
 #if HAS_BOOT_LOADER
 #define AO_BOOT_APPLICATION_BASE       ((uint32_t *) 0x08001000)
+#ifndef AO_BOOT_APPLICATION_BOUND
 #define AO_BOOT_APPLICATION_BOUND      ((uint32_t *) (0x08000000 + stm_flash_size()))
+#endif
 #define AO_BOOT_LOADER_BASE            ((uint32_t *) 0x08000000)
 #endif