altos/stmf0: Change tests for AO_BOOT_CHAIN and AO_BOOT_PIN to #if

[fw/altos] / src / stmf0 / ao_interrupt.c

diff --git a/src/stmf0/ao_interrupt.c b/src/stmf0/ao_interrupt.c
index c6d8ef348febc6e8c05862f00c3d7905fc7428c3..0d6f61131c0532d87e4daac9a9dafd8a895d2320 100644 (file)
--- a/src/stmf0/ao_interrupt.c
+++ b/src/stmf0/ao_interrupt.c
@@ -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
@@ -25,9 +26,11 @@
 #define IS_FLASH_LOADER        0
 #endif
 
+#ifndef RELOCATE_INTERRUPT
 #if !IS_FLASH_LOADER
 #define RELOCATE_INTERRUPT     1
 #endif
+#endif
 
 extern void main(void);
 extern char __stack__;
@@ -66,9 +69,9 @@ stm_flash_size(void) {
 
 void start(void)
 {
-#ifdef AO_BOOT_CHAIN
+#if AO_BOOT_CHAIN
        if (ao_boot_check_chain()) {
-#ifdef AO_BOOT_PIN
+#if AO_BOOT_PIN
                ao_boot_check_pin();
 #endif
        }