projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
had the sense backwards .. presence of 'attached' should put us in the loader
[fw/altos]
/
src
/
stmf0
/
ao_arch.h
diff --git
a/src/stmf0/ao_arch.h
b/src/stmf0/ao_arch.h
index 2597cadc735e8accb7285536d735386fa8069a76..5c5085d9685b17bbcc74b4e4d89c3006655c0a3b 100644
(file)
--- a/
src/stmf0/ao_arch.h
+++ b/
src/stmf0/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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-93,12
+94,17
@@
extern const uint32_t ao_radio_cal;
* For the stm32f042, we want to use the USB-based HSI48 clock
*/
* 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_SYSCLK 48000000
-#define AO_HCLK (AO_SYSCLK / AO_AHB_PRESCALER)
-
#endif
#endif
+#endif
+
+#define AO_HCLK (AO_SYSCLK / AO_AHB_PRESCALER)
#if AO_HSE || AO_HSI
#if AO_HSE || AO_HSI
@@
-114,21
+120,14
@@
extern const uint32_t ao_radio_cal;
#endif
#define AO_HCLK (AO_SYSCLK / AO_AHB_PRESCALER)
#endif
#define AO_HCLK (AO_SYSCLK / AO_AHB_PRESCALER)
-#define AO_PCLK1 (AO_HCLK / AO_APB1_PRESCALER)
-#define AO_PCLK2 (AO_HCLK / AO_APB2_PRESCALER)
+#define AO_PCLK (AO_HCLK / AO_APB_PRESCALER)
#define AO_SYSTICK (AO_HCLK)
#define AO_PANIC_DELAY_SCALE (AO_SYSCLK / 12000000)
#define AO_SYSTICK (AO_HCLK)
#define AO_PANIC_DELAY_SCALE (AO_SYSCLK / 12000000)
-#if AO_APB
1
_PRESCALER == 1
-#define AO_TIM
23467_CLK AO_PCLK1
+#if AO_APB_PRESCALER == 1
+#define AO_TIM
_CLK AO_PCLK
#else
#else
-#define AO_TIM23467_CLK (2 * AO_PCLK1)
-#endif
-
-#if AO_APB2_PRESCALER == 1
-#define AO_TIM91011_CLK AO_PCLK2
-#else
-#define AO_TIM91011_CLK (2 * AO_PCLK2)
+#define AO_TIM_CLK (2 * AO_PCLK)
#endif
#define AO_STM_NVIC_HIGH_PRIORITY (0 << 6)
#endif
#define AO_STM_NVIC_HIGH_PRIORITY (0 << 6)
@@
-150,10
+149,17
@@
ao_adc_init();
/* ADC maximum reported value */
#define AO_ADC_MAX 4095
/* ADC maximum reported value */
#define AO_ADC_MAX 4095
+#ifndef HAS_BOOT_LOADER
+#define HAS_BOOT_LOADER 1
+#endif
+
+#if HAS_BOOT_LOADER
#define AO_BOOT_APPLICATION_BASE ((uint32_t *) 0x08001000)
#define AO_BOOT_APPLICATION_BASE ((uint32_t *) 0x08001000)
+#ifndef AO_BOOT_APPLICATION_BOUND
#define AO_BOOT_APPLICATION_BOUND ((uint32_t *) (0x08000000 + stm_flash_size()))
#define AO_BOOT_APPLICATION_BOUND ((uint32_t *) (0x08000000 + stm_flash_size()))
+#endif
#define AO_BOOT_LOADER_BASE ((uint32_t *) 0x08000000)
#define AO_BOOT_LOADER_BASE ((uint32_t *) 0x08000000)
-#
define HAS_BOOT_LOADER 1
+#
endif
#endif /* _AO_ARCH_H_ */
#endif /* _AO_ARCH_H_ */