From 459315d75beb8ec27a8d844dae10846f2396a366 Mon Sep 17 00:00:00 2001
From: Antoine Drouin <poinix@gmail.com>
Date: Wed, 18 Aug 2010 02:04:20 +0000
Subject: [PATCH] one more step toward makefile-free airframes

---
 conf/airframes/Poine/booz2_a1.xml | 3 +--
 conf/boards/booz.makefile         | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/airframes/Poine/booz2_a1.xml b/conf/airframes/Poine/booz2_a1.xml
index fbf978de7a..8d066e4e46 100644
--- a/conf/airframes/Poine/booz2_a1.xml
+++ b/conf/airframes/Poine/booz2_a1.xml
@@ -207,8 +207,6 @@
   <makefile target="opening">
 
 
-FLASH_MODE = IAP
-
 # prevents motors from ever starting
 #ap.CFLAGS += -DKILL_MOTORS
 ap.CFLAGS += -DMODEM_BAUD=B57600
@@ -219,6 +217,7 @@ ap.CFLAGS += -DUSE_ADAPT_HOVER
 
 
   <target name="baloo" board="booz">
+    <option name="FLASH_MODE" value="IAP"/> <!-- that should be the default for the board but I'm putting it here as example--> 
     <subsystem name="radio_control" type="ppm"/>
     <subsystem name="actuators"     type="mkk"/>
     <subsystem name="imu"           type="b2v1"/>
diff --git a/conf/boards/booz.makefile b/conf/boards/booz.makefile
index 4b322e02ab..3b0dd78d93 100644
--- a/conf/boards/booz.makefile
+++ b/conf/boards/booz.makefile
@@ -5,4 +5,8 @@
 #
 ARCH=lpc21
 ARCHI=arm7
-BOARD_CFG = \"boards/booz2_v1_0.h\"
\ No newline at end of file
+BOARD_CFG = \"boards/booz2_v1_0.h\"
+
+ifndef FLASH_MODE
+FLASH_MODE = IAP
+endif
\ No newline at end of file