[paparazzi-commits] [5925] removed makefile variable $(TARGET).ARCH, f

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [5925] removed makefile variable $(TARGET).ARCH, f

From:	Felix Ruess
Subject:	[paparazzi-commits] [5925] removed makefile variable $(TARGET).ARCH, for AVRs please define your MCU with e.g.
Date:	Wed, 22 Sep 2010 21:40:38 +0000
Revision: 5925
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5925
Author:   flixr
Date:     2010-09-22 21:40:38 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
removed makefile variable $(TARGET).ARCH, for AVRs please define your MCU with 
e.g. $(TARGET).MCU = atmega8 instead of $(TARGET).ARCH

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/drops.xml
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/firestorm.xml
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/slayer2.xml
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/solarstorm.xml
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/spocII.xml
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/twinjet2.xml
    paparazzi3/trunk/conf/airframes/Poine/autoplato.xml
    paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml
    paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml
    paparazzi3/trunk/conf/airframes/Poine/turntable.xml
    paparazzi3/trunk/conf/airframes/demo.xml
    paparazzi3/trunk/conf/airframes/hitl_usb.xml
    paparazzi3/trunk/conf/airframes/mm/fixed-wing/merlin.xml
    paparazzi3/trunk/conf/airframes/obsolete/example.xml
    paparazzi3/trunk/conf/airframes/obsolete/lila.xml
    paparazzi3/trunk/conf/airframes/obsolete/malolo_sim.xml
    paparazzi3/trunk/conf/airframes/obsolete/nova.xml
    paparazzi3/trunk/conf/airframes/obsolete/tl.xml
    paparazzi3/trunk/conf/airframes/obsolete/twinstarmm.xml
    paparazzi3/trunk/conf/airframes/obsolete/xxx1.xml
    paparazzi3/trunk/conf/airframes/test_i2c.xml
    paparazzi3/trunk/conf/airframes/vor.xml
    paparazzi3/trunk/conf/airframes/wind_tunnel.xml
    paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile
    paparazzi3/trunk/conf/autopilot/classix.makefile
    paparazzi3/trunk/conf/autopilot/classix_proto1.makefile
    paparazzi3/trunk/conf/autopilot/csc.makefile
    paparazzi3/trunk/conf/autopilot/csc_ap.makefile
    paparazzi3/trunk/conf/autopilot/mercury.makefile
    paparazzi3/trunk/conf/autopilot/mercury_csc.makefile
    paparazzi3/trunk/conf/autopilot/rotorcraft.makefile
    paparazzi3/trunk/conf/autopilot/sitl.makefile
    paparazzi3/trunk/conf/autopilot/sitl_jsbsim.makefile
    paparazzi3/trunk/conf/autopilot/sitl_link_pprz.makefile
    paparazzi3/trunk/conf/autopilot/sitl_link_xbee.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/testing.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
    paparazzi3/trunk/conf/autopilot/tiny.makefile
    paparazzi3/trunk/conf/boards/classix.makefile
    paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
    paparazzi3/trunk/conf/boards/pc.makefile
    paparazzi3/trunk/conf/boards/tiny_2.11.makefile
    paparazzi3/trunk/sw/tools/gen_aircraft.ml

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/drops.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/drops.xml   2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/drops.xml   2010-09-22 
21:40:38 UTC (rev 5925)
@@ -269,7 +269,6 @@
 # Config for SITL simulation
 # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/firestorm.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/firestorm.xml       
2010-09-22 21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/firestorm.xml       
2010-09-22 21:40:38 UTC (rev 5925)
@@ -262,7 +262,6 @@
 # Config for SITL simulation
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml 2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml 2010-09-22 
21:40:38 UTC (rev 5925)
@@ -299,7 +299,6 @@
 # Config for SITL simulation
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
@@ -318,7 +317,6 @@
 
 # a test program to setup actuators 
 setup_actuators.ARCHDIR = $(ARCHI)
-setup_actuators.ARCH = arm7tdmi
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 
-DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART1 -DUART1_BAUD=B9600 
-DDATALINK=PPRZ -DPPRZ_UART=Uart1
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4015_hw.c main.c

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/slayer2.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/slayer2.xml 2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/slayer2.xml 2010-09-22 
21:40:38 UTC (rev 5925)
@@ -271,7 +271,6 @@
 # Config for SITL simulation
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c 
datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c 
$(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c 
$(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/solarstorm.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/solarstorm.xml      
2010-09-22 21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/solarstorm.xml      
2010-09-22 21:40:38 UTC (rev 5925)
@@ -254,7 +254,6 @@
 # Config for SITL simulation
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/spocII.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/spocII.xml  2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/spocII.xml  2010-09-22 
21:40:38 UTC (rev 5925)
@@ -254,7 +254,6 @@
 # Config for SITL simulation
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 
@@ -275,7 +274,6 @@
 
 # a test program to setup actuators 
 setup_actuators.ARCHDIR = $(ARCHI)
-setup_actuators.ARCH = arm7tdmi
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 
-DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART1 -DUART1_BAUD=B9600 
-DDATALINK=PPRZ -DPPRZ_UART=Uart1
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4015_hw.c main.c

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/twinjet2.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/twinjet2.xml        
2010-09-22 21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/twinjet2.xml        
2010-09-22 21:40:38 UTC (rev 5925)
@@ -304,7 +304,6 @@
 #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl_a.c fw_v_ctl_n.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/Poine/autoplato.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/autoplato.xml 2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/Poine/autoplato.xml 2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -12,7 +12,6 @@
 include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
 
 test_usb.ARCHDIR = $(ARCHI)
-test_usb.ARCH = arm7tdmi
 
 test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_usb.srcs += $(SRC_BOOZ_TEST)/atpt_main.c

Modified: paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml       2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml       2010-09-22 
21:40:38 UTC (rev 5925)
@@ -9,7 +9,6 @@
 MB=motor_bench
 
 main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
 
 main.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
 main.srcs = $(MB)/main_motor_bench.c
@@ -54,7 +53,6 @@
 #main.srcs += $(MB)/mb_mode_fixed_rpm.c
 
 foo.ARCHDIR = $(ARCHI)
-foo.ARCH = arm7tdmi
 
 foo.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
 foo.srcs = $(MB)/main_foo.c
@@ -74,7 +72,6 @@
 
 
 bar.ARCHDIR = $(ARCHI)
-bar.ARCH = arm7tdmi
 
 bar.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
 bar.srcs = $(MB)/main_bar.c

Modified: paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml    2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml    2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -9,7 +9,6 @@
   <makefile>
 
 tunnel.ARCHDIR = $(ARCHI)
-tunnel.ARCH = arm7tdmi
 
 tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"conf_demo.h\" -DLED -DTIME_LED=1
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
@@ -20,7 +19,6 @@
 PT_ANT = antenna
 
 main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
 
 main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(PT_ANT)
 main.srcs = $(PT_ANT)/pt_ant_main.c

Modified: paparazzi3/trunk/conf/airframes/Poine/turntable.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/turntable.xml 2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/Poine/turntable.xml 2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -9,7 +9,6 @@
 MB=motor_bench
 
 main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
 
 main.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" -I$(MB)
 main.CFLAGS += -DPERIPHERALS_AUTO_INIT

Modified: paparazzi3/trunk/conf/airframes/demo.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/demo.xml    2010-09-22 21:40:15 UTC (rev 
5924)
+++ paparazzi3/trunk/conf/airframes/demo.xml    2010-09-22 21:40:38 UTC (rev 
5925)
@@ -11,7 +11,6 @@
 # simple emtpy demo
 #
 demo1.ARCHDIR = $(ARCHI)
-demo1.ARCH = arm7tdmi
 
 demo1.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo1.srcs = main_demo1.c
@@ -20,7 +19,6 @@
 # hardware init ( pll ), system time and LEDs
 #
 demo2.ARCHDIR = $(ARCHI)
-demo2.ARCH = arm7tdmi
 
 demo2.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo2.srcs = main_demo2.c
@@ -34,7 +32,6 @@
 # UART (interrupts) and formated ascii printing
 #
 demo3.ARCHDIR = $(ARCHI)
-demo3.ARCH = arm7tdmi
 
 demo3.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo3.srcs = main_demo3.c
@@ -54,7 +51,6 @@
 # requires "link" to run on the other side of the serial link
 #
 demo4.ARCHDIR = $(ARCHI)
-demo4.ARCH = arm7tdmi
 
 demo4.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo4.srcs = main_demo4.c
@@ -78,7 +74,6 @@
 # IvySendMsg("1ME RAW_DATALINK 144 SETTING;0;0;%d", foo_value);
 #
 demo5.ARCHDIR = $(ARCHI)
-demo5.ARCH = arm7tdmi
 
 demo5.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo5.srcs = main_demo5.c
@@ -103,7 +98,6 @@
 # Serial link over USB
 #
 demo6.ARCHDIR = $(ARCHI)
-demo6.ARCH = arm7tdmi
 
 demo6.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 demo6.srcs = main_demo6.c
@@ -131,7 +125,6 @@
 #
 #
 test_spk.ARCHDIR = $(ARCHI)
-test_spk.ARCH = arm7tdmi
 
 test_spk.CFLAGS += -DBOARD_CONFIG=\"booz2_board_usb.h\"
 test_spk.srcs = main_test_spk.c

Modified: paparazzi3/trunk/conf/airframes/hitl_usb.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/hitl_usb.xml        2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/hitl_usb.xml        2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -154,7 +154,6 @@
 
 # Config for SITL simulation
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED
 sim.srcs = latlong.c downlink.c commands.c gps.c inter_mcu.c infrared.c 
fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c 
datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c 
$(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c 
$(SRC_ARCH)/led_hw.c
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN

Modified: paparazzi3/trunk/conf/airframes/mm/fixed-wing/merlin.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/mm/fixed-wing/merlin.xml    2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/mm/fixed-wing/merlin.xml    2010-09-22 
21:40:38 UTC (rev 5925)
@@ -225,7 +225,6 @@
 # Config for SITL simulation
 # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/obsolete/example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/obsolete/example.xml        2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/obsolete/example.xml        2010-09-22 
21:40:38 UTC (rev 5925)
@@ -13,7 +13,6 @@
 #
 #
 example_gps.ARCHDIR = $(ARCHI)
-example_gps.ARCH = arm7tdmi
 
 example_gps.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 example_gps.srcs = example/example_gps.c

Modified: paparazzi3/trunk/conf/airframes/obsolete/lila.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/obsolete/lila.xml   2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/obsolete/lila.xml   2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -248,7 +248,6 @@
 
 # Config for SITL simulation
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/obsolete/malolo_sim.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/obsolete/malolo_sim.xml     2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/obsolete/malolo_sim.xml     2010-09-22 
21:40:38 UTC (rev 5925)
@@ -224,7 +224,6 @@
 # Config for SITL simulation with JSBSim
 SIM_TYPE = JSBSIM
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 
 sim.CFLAGS += -I$(SIMDIR) -I/home/cocoleon/usr/include/JSBSim -I/usr/include
 sim.CFLAGS += `pkg-config glib-2.0 --cflags`

Modified: paparazzi3/trunk/conf/airframes/obsolete/nova.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/obsolete/nova.xml   2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/obsolete/nova.xml   2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -7,7 +7,6 @@
 FLASH_MODE = IAP
 
 timu.ARCHDIR = $(ARCHI)
-timu.ARCH = arm7tdmi
 
 timu.CFLAGS += -DBOARD_CONFIG=\"tiny_2_0.h\" 
-DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1e-1)'
 timu.srcs = nova_test_imu.c sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c

Modified: paparazzi3/trunk/conf/airframes/obsolete/tl.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/obsolete/tl.xml     2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/obsolete/tl.xml     2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -82,7 +82,6 @@
 FLASH_MODE = IAP
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" 
-DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(16.666e-3)' -I$(TL)
 ap.srcs = $(TL)/tl_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c
@@ -130,7 +129,6 @@
 #
 
 tmm.ARCHDIR = $(ARCHI)
-tmm.ARCH = arm7tdmi
 
 tmm.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" 
-DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(16.666e-3)'
 tmm.srcs = $(TL)/tl_test_mm_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c
@@ -146,7 +144,6 @@
 #
 
 timu.ARCHDIR = $(ARCHI)
-timu.ARCH = arm7tdmi
 
 timu.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" 
-DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(16.666e-3)'
 timu.srcs = $(TL)/tl_test_imu_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c

Modified: paparazzi3/trunk/conf/airframes/obsolete/twinstarmm.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/obsolete/twinstarmm.xml     2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/airframes/obsolete/twinstarmm.xml     2010-09-22 
21:40:38 UTC (rev 5925)
@@ -248,7 +248,6 @@
 # Config for SITL simulation
 # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl_a.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/airframes/obsolete/xxx1.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/obsolete/xxx1.xml   2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/obsolete/xxx1.xml   2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -279,7 +279,6 @@
 
 # a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
-setup_actuators.ARCH = arm7tdmi
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 
-DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 
-DDATALINK=PPRZ -DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4015_hw.c main.c

Modified: paparazzi3/trunk/conf/airframes/test_i2c.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/test_i2c.xml        2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/test_i2c.xml        2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -9,7 +9,6 @@
 
 ARCHI=arm7
 mb.ARCHDIR = $(ARCHI)
-mb.ARCH = arm7tdmi
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000

Modified: paparazzi3/trunk/conf/airframes/vor.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/vor.xml     2010-09-22 21:40:15 UTC (rev 
5924)
+++ paparazzi3/trunk/conf/airframes/vor.xml     2010-09-22 21:40:38 UTC (rev 
5925)
@@ -8,7 +8,6 @@
 
 FLASH_MODE = IAP
 main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
 
 main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 main.srcs = $(VOR)/lpc_vor_main.c

Modified: paparazzi3/trunk/conf/airframes/wind_tunnel.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/wind_tunnel.xml     2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/airframes/wind_tunnel.xml     2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -10,7 +10,6 @@
 WIND_TUNNEL=wind_tunnel
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(WIND_TUNNEL)
 ap.srcs = $(WIND_TUNNEL)/main.c
@@ -41,7 +40,6 @@
 MB=motor_bench
 
 mb.ARCHDIR = $(ARCHI)
-mb.ARCH = arm7tdmi
 
 mb.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(WIND_TUNNEL) -I$(MB)
 mb.srcs = $(WIND_TUNNEL)/main_mb.c

Modified: paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile   2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/booz2_test_progs.makefile   2010-09-22 
21:40:38 UTC (rev 5925)
@@ -26,7 +26,6 @@
 # test_led : blinks all leds
 #
 test_led.ARCHDIR = $(ARCHI)
-test_led.ARCH = arm7tdmi
 
 test_led.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_led.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -39,7 +38,6 @@
 # test_downlink : sends a TIME message
 #
 test_downlink.ARCHDIR = $(ARCHI)
-test_downlink.ARCH = arm7tdmi
 
 test_downlink.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_downlink.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -59,7 +57,6 @@
 # test_max1168 : samples gyros and mags, sends values 
 #
 test_max1168.ARCHDIR = $(ARCHI)
-test_max1168.ARCH = arm7tdmi
 
 test_max1168.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH)
 test_max1168.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -82,7 +79,6 @@
 # test MICROMAG
 #
 test_micromag.ARCHDIR = $(ARCHI)
-test_micromag.ARCH = arm7tdmi
 
 test_micromag.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH)
 test_micromag.srcs += $(SRC_BOOZ_TEST)/booz2_test_micromag.c
@@ -108,7 +104,6 @@
 # tunnel hw
 #
 tunnel.ARCHDIR = $(ARCHI)
-tunnel.ARCH = arm7tdmi
 
 tunnel.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 tunnel.srcs += $(SRC_BOOZ_TEST)/booz2_tunnel.c
@@ -125,7 +120,6 @@
 # tunnel bit banging
 #
 tunnel_bb.ARCHDIR = $(ARCHI)
-tunnel_bb.ARCH = arm7tdmi
 
 tunnel_bb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 tunnel_bb.srcs += $(SRC_BOOZ_TEST)/booz2_tunnel_bb.c
@@ -139,7 +133,6 @@
 # test GPS
 #
 test_gps.ARCHDIR = $(ARCHI)
-test_gps.ARCH = arm7tdmi
 
 test_gps.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_gps.srcs += $(SRC_BOOZ_TEST)/booz2_test_gps.c
@@ -165,7 +158,6 @@
 # test modem
 #
 test_modem.ARCHDIR = $(ARCHI)
-test_modem.ARCH = arm7tdmi
 
 test_modem.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_modem.srcs += $(SRC_BOOZ_TEST)/booz2_test_modem.c
@@ -187,7 +179,6 @@
 # test USB telemetry
 #
 test_usb.ARCHDIR = $(ARCHI)
-test_usb.ARCH = arm7tdmi
 
 test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_usb.srcs += $(SRC_BOOZ_TEST)/booz2_test_usb.c
@@ -217,7 +208,6 @@
 # test AMI
 #
 test_ami.ARCHDIR = $(ARCHI)
-test_ami.ARCH = arm7tdmi
 
 test_ami.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_ami.srcs += $(SRC_BOOZ_TEST)/booz2_test_ami.c
@@ -241,7 +231,6 @@
 # test crista
 #
 test_crista.ARCHDIR = $(ARCHI)
-test_crista.ARCH = arm7tdmi
 
 test_crista.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH)
 test_crista.srcs += $(SRC_BOOZ_TEST)/booz2_test_crista.c
@@ -266,7 +255,6 @@
 # test MICROMAG
 #
 test_micromag2.ARCHDIR = $(ARCHI)
-test_micromag2.ARCH = arm7tdmi
 
 test_micromag2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH)
 test_micromag2.srcs += $(SRC_BOOZ_TEST)/booz2_test_micromag_2.c
@@ -291,7 +279,6 @@
 # test IMU b2
 #
 test_imu_b2.ARCHDIR = $(ARCHI)
-test_imu_b2.ARCH = arm7tdmi
 
 test_imu_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH)
 test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz2_test_imu_b2.c
@@ -321,7 +308,6 @@
 #
 
 test_rc_spektrum.ARCHDIR = $(ARCHI)
-test_rc_spektrum.ARCH = arm7tdmi
 
 test_rc_spektrum.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
$(BOOZ_CFLAGS)
 test_rc_spektrum.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -354,7 +340,6 @@
 #
 
 test_rc_ppm.ARCHDIR = $(ARCHI)
-test_rc_ppm.ARCH = arm7tdmi
 
 test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) $(BOOZ_CFLAGS)
 test_rc_ppm.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -385,7 +370,6 @@
 # test MC
 #
 test_mc.ARCHDIR = $(ARCHI)
-test_mc.ARCH = arm7tdmi
 
 test_mc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH)
 test_mc.srcs += $(SRC_BOOZ_TEST)/booz2_test_mc.c
@@ -410,7 +394,6 @@
 # test BUSS BLDC
 #
 test_buss_bldc.ARCHDIR = $(ARCHI)
-test_buss_bldc.ARCH = arm7tdmi
 
 test_buss_bldc.CFLAGS += -DPERIPHERALS_AUTO_INIT
 test_buss_bldc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH)
@@ -434,7 +417,6 @@
 # test asctec BLMC
 #
 test_amc.ARCHDIR = $(ARCHI)
-test_amc.ARCH = arm7tdmi
 
 test_amc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) 
-I$(SRC_BOOZ_ARCH) 
 test_amc.srcs += $(SRC_BOOZ_TEST)/booz2_test_amc.c
@@ -464,7 +446,6 @@
 # test_mkk_bldc : 
 #
 test_mkk_bldc.ARCHDIR = $(ARCHI)
-test_mkk_bldc.ARCH = arm7tdmi
 
 test_mkk_bldc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
 test_mkk_bldc.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -480,7 +461,6 @@
 # test 24 bits baro
 #
 test_baro_24.ARCHDIR = $(ARCHI)
-test_baro_24.ARCH = arm7tdmi
 
 test_baro_24.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) $(BOOZ_CFLAGS)
 test_baro_24.srcs += $(SRC_BOOZ_TEST)/booz2_test_baro_24.c
@@ -503,7 +483,6 @@
 # test_coders : blinks all leds
 #
 test_coder.ARCHDIR = $(ARCHI)
-test_coder.ARCH = arm7tdmi
 
 test_coder.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" 
$(BOOZ_CFLAGS)
 test_coder.CFLAGS += -DPERIPHERALS_AUTO_INIT

Modified: paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile    2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/booz_test_progs.makefile    2010-09-22 
21:40:38 UTC (rev 5925)
@@ -64,7 +64,6 @@
 #   MODEM_BAUD     :
 #
 test_telemetry.ARCHDIR   = $(ARCHI)
-test_telemetry.ARCH      = arm7tdmi
 test_telemetry.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_telemetry.CFLAGS += -DPERIPHERALS_AUTO_INIT
 test_telemetry.srcs   += test/test_telemetry.c \
@@ -90,7 +89,6 @@
 #   MODEM_BAUD
 #
 test_baro.ARCHDIR   = $(ARCHI)
-test_baro.ARCH      = arm7tdmi
 test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_baro.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_ARCH) 
-I$(SRC_BOARD)
 test_baro.CFLAGS += -DPERIPHERALS_AUTO_INIT
@@ -137,7 +135,6 @@
 #   RADIO_CONTROL_LED
 #
 test_rc_ppm.ARCHDIR   = $(ARCHI)
-test_rc_ppm.ARCH      = arm7tdmi
 
 test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_rc_ppm.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD)
@@ -165,7 +162,6 @@
 # simple test of mikrokopter motor controllers
 #
 test_esc_mkk_simple.ARCHDIR = $(ARCHI)
-test_esc_mkk_simple.ARCH    = arm7tdmi
 test_esc_mkk_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
 test_esc_mkk_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_esc_mkk_simple.srcs = test/test_esc_mkk_simple.c      \
@@ -184,7 +180,6 @@
 # test actuators mkk
 #
 test_actuators_mkk.ARCHDIR = $(ARCHI)
-test_actuators_mkk.ARCH      = arm7tdmi
 test_actuators_mkk.CFLAGS = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) 
-DPERIPHERALS_AUTO_INIT
 test_actuators_mkk.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_actuators_mkk.srcs = test/test_actuators.c \
@@ -216,7 +211,6 @@
 # test ami601
 #
 test_ami601.ARCHDIR = $(ARCHI)
-test_ami601.ARCH      = arm7tdmi
 test_ami601.CFLAGS = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT
 test_ami601.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 test_ami601.srcs = test/peripherals/test_ami601.c \

Modified: paparazzi3/trunk/conf/autopilot/classix.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/classix.makefile    2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/autopilot/classix.makefile    2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -3,21 +3,17 @@
 ARCHI=arm7
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 
 fbw.ARCHDIR = $(ARCHI)
-fbw.ARCH = arm7tdmi
 
 test.ARCHDIR = $(ARCHI)
-test.ARCH = arm7tdmi
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000
 
 # A test program to monitor the ADC values
 test_adcs.ARCHDIR = $(ARCHI)
-test_adcs.ARCH = arm7tdmi
 
 test_adcs.CFLAGS += -DAP -DBOARD_CONFIG=\"classix.h\" -DLED -DTIME_LED=2 -DADC 
-DUSE_AD1 -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4 -DUSE_AD1_5  -DUSE_AD1_6  
-DUSE_AD1_7
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
@@ -29,7 +25,6 @@
 # Message to send on Ivy bus, 1500 on servo 3 for aircraft 16
 # xxx RAW_DATALINK 16 SET_ACTUATOR;1500;3
 setup_actuators.ARCHDIR = $(ARCHI)
-setup_actuators.ARCH = arm7tdmi
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"classix.h\" -DLED 
-DTIME_LED=2 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017 
-DSERVOS_4017_CLOCK_FALLING -DUSE_UART0 -DUART0_BAUD=B57600 -DDATALINK=PPRZ 
-DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4017_hw.c main.c

Modified: paparazzi3/trunk/conf/autopilot/classix_proto1.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/classix_proto1.makefile     2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/classix_proto1.makefile     2010-09-22 
21:40:38 UTC (rev 5925)
@@ -3,10 +3,8 @@
 ARCHI=arm7
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 fbw.ARCHDIR = $(ARCHI)
-fbw.ARCH = arm7tdmi
 
 LPC21ISP_BAUD = 115200
 LPC21ISP_XTAL = 14746
\ No newline at end of file

Modified: paparazzi3/trunk/conf/autopilot/csc.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/csc.makefile        2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/autopilot/csc.makefile        2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -42,7 +42,6 @@
 SRC_CSC=csc
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -I$(SRC_CSC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -95,7 +94,6 @@
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
@@ -120,7 +118,6 @@
 #
 
 test_can1.ARCHDIR = $(ARCHI)
-test_can1.ARCH = arm7tdmi
 
 
 test_can1.CFLAGS += -I$(SRC_CSC)

Modified: paparazzi3/trunk/conf/autopilot/csc_ap.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/csc_ap.makefile     2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/autopilot/csc_ap.makefile     2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -42,7 +42,6 @@
 SRC_CSC=csc
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -I$(SRC_CSC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -98,7 +97,6 @@
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)

Modified: paparazzi3/trunk/conf/autopilot/mercury.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/mercury.makefile    2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/autopilot/mercury.makefile    2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -44,7 +44,6 @@
 SRC_BOOZ=booz
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -I$(SRC_CSC) -I$(SRC_BOOZ) -I$(SRC_CSC_ARCH)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -123,7 +122,6 @@
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)

Modified: paparazzi3/trunk/conf/autopilot/mercury_csc.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/mercury_csc.makefile        2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/mercury_csc.makefile        2010-09-22 
21:40:38 UTC (rev 5925)
@@ -43,7 +43,6 @@
 SRC_CSC_ARCH=$(SRC_CSC)/$(ARCHI)
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -I$(SRC_CSC) -I$(SRC_CSC_ARCH)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -94,7 +93,6 @@
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
@@ -119,7 +117,6 @@
 #
 
 test_can1.ARCHDIR = $(ARCHI)
-test_can1.ARCH = arm7tdmi
 
 
 test_can1.CFLAGS += -I$(SRC_CSC)

Modified: paparazzi3/trunk/conf/autopilot/rotorcraft.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/rotorcraft.makefile 2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/autopilot/rotorcraft.makefile 2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -47,7 +47,6 @@
 
 ap.ARCHDIR = $(ARCHI)
 # this is supposedly ignored by the stm32 makefile
-ap.ARCH = arm7tdmi
 
 
 ap.CFLAGS += $(BOOZ_INC)

Modified: paparazzi3/trunk/conf/autopilot/sitl.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/sitl.makefile       2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/autopilot/sitl.makefile       2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -1,5 +1,4 @@
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs += latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
 

Modified: paparazzi3/trunk/conf/autopilot/sitl_jsbsim.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/sitl_jsbsim.makefile        2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/sitl_jsbsim.makefile        2010-09-22 
21:40:38 UTC (rev 5925)
@@ -1,5 +1,4 @@
 jsbsim.ARCHDIR = $(ARCHI)
-jsbsim.ARCH = sitl
 
 # external libraries
 jsbsim.CFLAGS = -I$(SIMDIR) -I/usr/include `pkg-config glib-2.0 --cflags`

Modified: paparazzi3/trunk/conf/autopilot/sitl_link_pprz.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/sitl_link_pprz.makefile     2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/sitl_link_pprz.makefile     2010-09-22 
21:40:38 UTC (rev 5925)
@@ -1,4 +1,3 @@
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=PprzTransport -DINFRARED -DRADIO_CONTROL_SETTINGS 
-DSIM_UART -DDOWNLINK_AP_DEVICE=SimUart -DDOWNLINK_FBW_DEVICE=SimUart 
-DDATALINK=PPRZ
 sim.srcs = radio_control.c downlink.c pprz_transport.c commands.c gps.c 
inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c 
main_fbw.c main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c  $(SRC_ARCH)/sim_uart.c datalink.c 

Modified: paparazzi3/trunk/conf/autopilot/sitl_link_xbee.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/sitl_link_xbee.makefile     2010-09-22 
21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/sitl_link_xbee.makefile     2010-09-22 
21:40:38 UTC (rev 5925)
@@ -1,4 +1,3 @@
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=XBeeTransport -DINFRARED -DRADIO_CONTROL_SETTINGS 
-DSIM_UART -DSIM_XBEE -DXBEE_UART=SimUart
 sim.srcs = radio_control.c downlink.c xbee.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c main_fbw.c 
main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c  $(SRC_ARCH)/sim_uart.c 

Modified: paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/testing.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/testing.makefile       
2010-09-22 21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/testing.makefile       
2010-09-22 21:40:38 UTC (rev 5925)
@@ -2,7 +2,6 @@
 
 # a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
-setup_actuators.ARCH = arm7tdmi
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 
-DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 
-DDATALINK=PPRZ -DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4015_hw.c main.c
@@ -10,7 +9,6 @@
 
 # a test program to tunnel between both uart
 tunnel.ARCHDIR = $(ARCHI)
-tunnel.ARCH = arm7tdmi
 
 tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DLED
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
@@ -18,7 +16,6 @@
 
 # A test program to monitor the ADC values
 test_adcs.ARCHDIR = $(ARCHI)
-test_adcs.ARCH = arm7tdmi
 
 test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC 
-DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5 
-DUSE_ADC_6 -DUSE_ADC_7
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport 
-DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 
-DDATALINK=XBEE -DUART0_BAUD=B9600
@@ -30,7 +27,6 @@
 
 # a configuration program to access both uart through usb
 usb_tunnel_0.ARCHDIR = $(ARCHI)
-usb_tunnel_0.ARCH = arm7tdmi
 usb_tunnel_0.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART0 
-DUART0_BAUD=B115200
 usb_tunnel_0.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
@@ -39,7 +35,6 @@
 usb_tunnel_0.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 
 usb_tunnel_1.ARCHDIR = $(ARCHI)
-usb_tunnel_1.ARCH = arm7tdmi
 usb_tunnel_1.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART1 
-DUART1_BAUD=B115200
 usb_tunnel_1.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c

Modified: paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile      
2010-09-22 21:40:15 UTC (rev 5924)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile      
2010-09-22 21:40:38 UTC (rev 5925)
@@ -17,7 +17,6 @@
 
 
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 
 sim.CFLAGS  += -DSITL
 sim.CFLAGS  += `pkg-config glib-2.0 --cflags` -I /usr/include/meschach

Modified: paparazzi3/trunk/conf/autopilot/tiny.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny.makefile       2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/autopilot/tiny.makefile       2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -4,10 +4,8 @@
 ARCH=arm7
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 fbw.ARCHDIR = $(ARCHI)
-fbw.ARCH = arm7tdmi
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000
@@ -28,7 +26,6 @@
 
 # a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
-setup_actuators.ARCH = arm7tdmi
 
 setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 
-DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 
-DDATALINK=PPRZ -DPPRZ_UART=Uart0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4015_hw.c main.c
@@ -36,7 +33,6 @@
 
 # a test program to tunnel between both uart
 tunnel.ARCHDIR = $(ARCHI)
-tunnel.ARCH = arm7tdmi
 
 tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DLED
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
@@ -44,7 +40,6 @@
 
 # A test program to monitor the ADC values
 test_adcs.ARCHDIR = $(ARCHI)
-test_adcs.ARCH = arm7tdmi
 
 test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC 
-DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5 
-DUSE_ADC_6 -DUSE_ADC_7
 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport 
-DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 
-DDATALINK=XBEE -DUART0_BAUD=B9600
@@ -56,7 +51,6 @@
 
 # a configuration program to access both uart through usb
 usb_tunnel_0.ARCHDIR = $(ARCHI)
-usb_tunnel_0.ARCH = arm7tdmi
 usb_tunnel_0.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART0 
-DUART0_BAUD=B115200
 usb_tunnel_0.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
@@ -65,7 +59,6 @@
 usb_tunnel_0.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 
 usb_tunnel_1.ARCHDIR = $(ARCHI)
-usb_tunnel_1.ARCH = arm7tdmi
 usb_tunnel_1.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART1 
-DUART1_BAUD=B115200
 usb_tunnel_1.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
 usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c

Modified: paparazzi3/trunk/conf/boards/classix.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/classix.makefile       2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/boards/classix.makefile       2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -31,7 +31,6 @@
 
 # All targets on the TINY board run on the same processor achitecture
 $(TARGET).ARCHDIR = $(ARCHI)
-$(TARGET).ARCH = arm7tdmi
 
 # Battery Voltage
 fbw.CFLAGS +=  -DUSE_AD0

Modified: paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -22,7 +22,6 @@
 
        $(TARGET).ARCHDIR = $(ARCHI)
 # not needed?
-#      $(TARGET).ARCH = arm7tdmi
 
 endif
 # -----------------------------------------------------------------------

Modified: paparazzi3/trunk/conf/boards/pc.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/pc.makefile    2010-09-22 21:40:15 UTC (rev 
5924)
+++ paparazzi3/trunk/conf/boards/pc.makefile    2010-09-22 21:40:38 UTC (rev 
5925)
@@ -15,5 +15,4 @@
 
 
 $(TARGET).ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 

Modified: paparazzi3/trunk/conf/boards/tiny_2.11.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-09-22 21:40:15 UTC 
(rev 5924)
+++ paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-09-22 21:40:38 UTC 
(rev 5925)
@@ -44,5 +44,4 @@
 
 # All targets on the TINY board run on the same processor achitecture
 $(TARGET).ARCHDIR = $(ARCHI)
-$(TARGET).ARCH = arm7tdmi
 

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-09-22 21:40:15 UTC (rev 
5924)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-09-22 21:40:38 UTC (rev 
5925)
@@ -261,7 +261,7 @@
             fprintf makefile_ac "BOARD_PROCESSOR = %s\n" 
              (Xml.attrib target "processor");
           fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib target "board");
-(**          fprintf makefile_ac "%s.ARCHDIR = $(ARCHI)\n%s.ARCH = 
$(ARCH)\n%s.TARGET = %s\n%s.TARGETDIR = %s\n"
+(**          fprintf makefile_ac "%s.ARCHDIR = $(ARCHI)\n"
                (Xml.attrib target "name") (Xml.attrib target "name")
                (Xml.attrib target "name") (Xml.attrib target "name")
                (Xml.attrib target "name") (Xml.attrib target "name");
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [5925] removed makefile variable $(TARGET).ARCH, for AVRs please define your MCU with e.g., Felix Ruess <=
Prev by Date: [paparazzi-commits] [5924] introduced .MCU makefile variable so we can remove . ARCH later which is only used to set the MCU type for the compiler.
Next by Date: [paparazzi-commits] [5926] moved arm7 directory to arch/ lpc21 and set most makefiles accordingly
Previous by thread: [paparazzi-commits] [5924] introduced .MCU makefile variable so we can remove . ARCH later which is only used to set the MCU type for the compiler.
Next by thread: [paparazzi-commits] [5926] moved arm7 directory to arch/ lpc21 and set most makefiles accordingly
Index(es):
- Date
- Thread