diff --git a/conf/airframes/ENAC/fixed-wing/drops.xml b/conf/airframes/ENAC/fixed-wing/drops.xml
index 258fd2f6fa..7810433040 100644
--- a/conf/airframes/ENAC/fixed-wing/drops.xml
+++ b/conf/airframes/ENAC/fixed-wing/drops.xml
@@ -269,7 +269,6 @@ ap.srcs += snav.c
 # 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
 
diff --git a/conf/airframes/ENAC/fixed-wing/firestorm.xml b/conf/airframes/ENAC/fixed-wing/firestorm.xml
index 5a29cfcb3f..70b5fda10a 100644
--- a/conf/airframes/ENAC/fixed-wing/firestorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/firestorm.xml
@@ -262,7 +262,6 @@ ap.CFLAGS += -DUSE_MODULES
 # 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
 
diff --git a/conf/airframes/ENAC/fixed-wing/funjet1.xml b/conf/airframes/ENAC/fixed-wing/funjet1.xml
index a23fa01e4b..f7bdd41c18 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet1.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet1.xml
@@ -299,7 +299,6 @@ ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150
 # 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 @@ sim.srcs += nav_line.c nav_survey_rectangle.c
 
 # 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
diff --git a/conf/airframes/ENAC/fixed-wing/slayer2.xml b/conf/airframes/ENAC/fixed-wing/slayer2.xml
index 9c54fb869a..efa6aa0c3d 100644
--- a/conf/airframes/ENAC/fixed-wing/slayer2.xml
+++ b/conf/airframes/ENAC/fixed-wing/slayer2.xml
@@ -271,7 +271,6 @@ ap.CFLAGS += -D BARO_MS5534A_W1=0xAC20 -D BARO_MS5534A_W2=0x87D9 -D BARO_MS5534A
 # 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
 
diff --git a/conf/airframes/ENAC/fixed-wing/solarstorm.xml b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
index 9a2113f44f..8e61f28abf 100644
--- a/conf/airframes/ENAC/fixed-wing/solarstorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
@@ -254,7 +254,6 @@ ap.CFLAGS += -DUSE_MODULES
 # 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
 
diff --git a/conf/airframes/ENAC/fixed-wing/spocII.xml b/conf/airframes/ENAC/fixed-wing/spocII.xml
index d1e8089db5..04813a77ca 100644
--- a/conf/airframes/ENAC/fixed-wing/spocII.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocII.xml
@@ -254,7 +254,6 @@ ap.CFLAGS += -DUSE_ADC_3 -DADC_CHANNEL_CURRENT=ADC_3
 # 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 @@ jsbsim.srcs += $(SIMDIR)/sim_ac_fw.c
 
 # 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
diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
index fbe6681233..646f131823 100644
--- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
@@ -304,7 +304,6 @@ ap.CFLAGS += -DUSE_MODULES
 #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
 
diff --git a/conf/airframes/Poine/autoplato.xml b/conf/airframes/Poine/autoplato.xml
index bf4f142dc7..c716219dfd 100644
--- a/conf/airframes/Poine/autoplato.xml
+++ b/conf/airframes/Poine/autoplato.xml
@@ -12,7 +12,6 @@ FLASH_MODE = IAP
 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
diff --git a/conf/airframes/Poine/motor_bench.xml b/conf/airframes/Poine/motor_bench.xml
index 0ef429d1d0..918d766a0f 100644
--- a/conf/airframes/Poine/motor_bench.xml
+++ b/conf/airframes/Poine/motor_bench.xml
@@ -9,7 +9,6 @@ FLASH_MODE = IAP
 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_modes.c
 #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 @@ foo.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c
 
 
 bar.ARCHDIR = $(ARCHI)
-bar.ARCH = arm7tdmi
 
 bar.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
 bar.srcs = $(MB)/main_bar.c
diff --git a/conf/airframes/Poine/pt_ant.xml b/conf/airframes/Poine/pt_ant.xml
index cbc45eef89..cbfdb0bd14 100644
--- a/conf/airframes/Poine/pt_ant.xml
+++ b/conf/airframes/Poine/pt_ant.xml
@@ -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 @@ FLASH_MODE = IAP
 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
diff --git a/conf/airframes/Poine/turntable.xml b/conf/airframes/Poine/turntable.xml
index aa6b053208..647e474039 100644
--- a/conf/airframes/Poine/turntable.xml
+++ b/conf/airframes/Poine/turntable.xml
@@ -9,7 +9,6 @@ FLASH_MODE = IAP
 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
diff --git a/conf/airframes/demo.xml b/conf/airframes/demo.xml
index d06b898d9d..9a52ede37a 100644
--- a/conf/airframes/demo.xml
+++ b/conf/airframes/demo.xml
@@ -11,7 +11,6 @@ FLASH_MODE = IAP
 # 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 @@ demo1.srcs = main_demo1.c
 # 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 @@ demo2.CFLAGS += -DLED
 # 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 @@ demo3.srcs += $(SRC_ARCH)/uart_hw.c
 # 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 @@ demo4.srcs += downlink.c pprz_transport.c
 # 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 @@ demo5.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
 # 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 @@ demo6.srcs += downlink.c pprz_transport.c
 #
 #
 test_spk.ARCHDIR = $(ARCHI)
-test_spk.ARCH = arm7tdmi
 
 test_spk.CFLAGS += -DBOARD_CONFIG=\"booz2_board_usb.h\"
 test_spk.srcs = main_test_spk.c
diff --git a/conf/airframes/hitl_usb.xml b/conf/airframes/hitl_usb.xml
index dd7763ae7c..535e7f48ac 100644
--- a/conf/airframes/hitl_usb.xml
+++ b/conf/airframes/hitl_usb.xml
@@ -154,7 +154,6 @@ ap.CFLAGS += -DGPS_USE_LATLONG # simulating LEA 5H
 
 # 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
diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml
index fca0e1b6f5..90092c3b93 100644
--- a/conf/airframes/mm/fixed-wing/merlin.xml
+++ b/conf/airframes/mm/fixed-wing/merlin.xml
@@ -225,7 +225,6 @@ ap.srcs += snav.c
 # 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
 
diff --git a/conf/airframes/obsolete/example.xml b/conf/airframes/obsolete/example.xml
index f76a1ceb37..fc36b7c49b 100644
--- a/conf/airframes/obsolete/example.xml
+++ b/conf/airframes/obsolete/example.xml
@@ -13,7 +13,6 @@ FLASH_MODE = IAP
 #
 #
 example_gps.ARCHDIR = $(ARCHI)
-example_gps.ARCH = arm7tdmi
 
 example_gps.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 example_gps.srcs = example/example_gps.c
diff --git a/conf/airframes/obsolete/lila.xml b/conf/airframes/obsolete/lila.xml
index dfea3b2b24..7b35ff5c23 100644
--- a/conf/airframes/obsolete/lila.xml
+++ b/conf/airframes/obsolete/lila.xml
@@ -248,7 +248,6 @@ ap.srcs += snav.c
 
 # 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
 
diff --git a/conf/airframes/obsolete/malolo_sim.xml b/conf/airframes/obsolete/malolo_sim.xml
index 1cd7ac2072..dc40e7a769 100644
--- a/conf/airframes/obsolete/malolo_sim.xml
+++ b/conf/airframes/obsolete/malolo_sim.xml
@@ -224,7 +224,6 @@ include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
 # 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`
diff --git a/conf/airframes/obsolete/nova.xml b/conf/airframes/obsolete/nova.xml
index 216f441a5a..365565a847 100644
--- a/conf/airframes/obsolete/nova.xml
+++ b/conf/airframes/obsolete/nova.xml
@@ -7,7 +7,6 @@ ARCHI=arm7
 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
diff --git a/conf/airframes/obsolete/tl.xml b/conf/airframes/obsolete/tl.xml
index b8a1e385ac..5bfeb5719a 100644
--- a/conf/airframes/obsolete/tl.xml
+++ b/conf/airframes/obsolete/tl.xml
@@ -82,7 +82,6 @@ TL=coaxial
 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 @@ ap.srcs += common_nav.c $(TL)/tl_nav.c
 #
 
 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 @@ tmm.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c
 #
 
 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
diff --git a/conf/airframes/obsolete/twinstarmm.xml b/conf/airframes/obsolete/twinstarmm.xml
index 09ec1d5aa7..fe572fc1dc 100644
--- a/conf/airframes/obsolete/twinstarmm.xml
+++ b/conf/airframes/obsolete/twinstarmm.xml
@@ -248,7 +248,6 @@ ap.srcs += snav.c
 # 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
 
diff --git a/conf/airframes/obsolete/xxx1.xml b/conf/airframes/obsolete/xxx1.xml
index 60582baec2..ff8aa6fe28 100644
--- a/conf/airframes/obsolete/xxx1.xml
+++ b/conf/airframes/obsolete/xxx1.xml
@@ -279,7 +279,6 @@ sim.srcs += nav_line.c nav_survey_rectangle.c
 
 # 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
diff --git a/conf/airframes/test_i2c.xml b/conf/airframes/test_i2c.xml
index 47a7f4c9b5..e62d6906d5 100644
--- a/conf/airframes/test_i2c.xml
+++ b/conf/airframes/test_i2c.xml
@@ -9,7 +9,6 @@
 
 ARCHI=arm7
 mb.ARCHDIR = $(ARCHI)
-mb.ARCH = arm7tdmi
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000
diff --git a/conf/airframes/vor.xml b/conf/airframes/vor.xml
index d417a4b9aa..839dfb527e 100644
--- a/conf/airframes/vor.xml
+++ b/conf/airframes/vor.xml
@@ -8,7 +8,6 @@ VOR=vor
 
 FLASH_MODE = IAP
 main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
 
 main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\"
 main.srcs = $(VOR)/lpc_vor_main.c
diff --git a/conf/airframes/wind_tunnel.xml b/conf/airframes/wind_tunnel.xml
index b275d66c39..52ee2fde9c 100644
--- a/conf/airframes/wind_tunnel.xml
+++ b/conf/airframes/wind_tunnel.xml
@@ -10,7 +10,6 @@ FLASH_MODE = IAP
 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 @@ ap.srcs += $(WIND_TUNNEL)/wt_servo.c
 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
diff --git a/conf/autopilot/booz2_test_progs.makefile b/conf/autopilot/booz2_test_progs.makefile
index bc5d6aef53..5c0cb076f1 100644
--- a/conf/autopilot/booz2_test_progs.makefile
+++ b/conf/autopilot/booz2_test_progs.makefile
@@ -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_led.srcs   += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 # 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_downlink.srcs   += downlink.c pprz_transport.c
 # 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_max1168.srcs   += $(SRC_BOOZ)/peripherals/booz_max1168.c \
 # 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 @@ test_micromag.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c
 # 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.srcs += $(SRC_ARCH)/uart_hw.c
 # 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 @@ tunnel_bb.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 # 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_gps.srcs += $(SRC_BOOZ)/booz2_gps.c
 # 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_modem.srcs += downlink.c pprz_transport.c
 # 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_usb.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c
 # 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_ami.srcs += AMI601.c
 # 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_crista.srcs += $(SRC_BOOZ)/booz2_imu_crista.c $(SRC_BOOZ_ARCH)/booz2_imu_cr
 # 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_micromag2.srcs += downlink.c pprz_transport.c
 # 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_imu_b2.srcs += $(SRC_BOOZ)/booz2_imu.c
 #
 
 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_spektrum.srcs += $(SRC_BOOZ)/booz_radio_control.c \
 #
 
 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_rc_ppm.srcs += $(SRC_BOOZ)/booz_radio_control.c \
 # 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_mc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # 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_buss_bldc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # 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_amc.CFLAGS += -DFLOAT_T=float
 # 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_mkk_bldc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # 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_baro_24.srcs += $(SRC_BOOZ)/booz2_baro_24.c
 # 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
diff --git a/conf/autopilot/booz_test_progs.makefile b/conf/autopilot/booz_test_progs.makefile
index d733d63401..c103dad9d0 100644
--- a/conf/autopilot/booz_test_progs.makefile
+++ b/conf/autopilot/booz_test_progs.makefile
@@ -64,7 +64,6 @@ BOARD_CFG=\"boards/booz_1.0.h\"
 #   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 @@ test_telemetry.srcs   += $(SRC_ARCH)/uart_hw.c
 #   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 @@ test_baro.srcs += $(SRC_BOOZ)/booz2_battery.c
 #   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 @@ test_rc_ppm.srcs   += $(SRC_BOOZ)/booz_radio_control.c \
 # 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_esc_mkk_simple.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 # 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_actuators_mkk.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_V
 # 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 \
diff --git a/conf/autopilot/classix.makefile b/conf/autopilot/classix.makefile
index 9ded437fc8..2cbd8e141a 100644
--- a/conf/autopilot/classix.makefile
+++ b/conf/autopilot/classix.makefile
@@ -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 @@ test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SR
 # 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
diff --git a/conf/autopilot/classix_proto1.makefile b/conf/autopilot/classix_proto1.makefile
index f850c93345..f9540d5770 100644
--- a/conf/autopilot/classix_proto1.makefile
+++ b/conf/autopilot/classix_proto1.makefile
@@ -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
diff --git a/conf/autopilot/csc.makefile b/conf/autopilot/csc.makefile
index dd2369fc30..ff97504153 100644
--- a/conf/autopilot/csc.makefile
+++ b/conf/autopilot/csc.makefile
@@ -42,7 +42,6 @@ BOARD_CFG = \"csc_board_v1_0.h\"
 SRC_CSC=csc
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -I$(SRC_CSC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -95,7 +94,6 @@ ap.CFLAGS += -DERROR_LED=4
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
@@ -120,7 +118,6 @@ test_uart.srcs += downlink.c pprz_transport.c
 #
 
 test_can1.ARCHDIR = $(ARCHI)
-test_can1.ARCH = arm7tdmi
 
 
 test_can1.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/csc_ap.makefile b/conf/autopilot/csc_ap.makefile
index 145bbee014..a5c58d2871 100644
--- a/conf/autopilot/csc_ap.makefile
+++ b/conf/autopilot/csc_ap.makefile
@@ -42,7 +42,6 @@ PERIODIC_FREQ = 40
 SRC_CSC=csc
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 ap.CFLAGS += -I$(SRC_CSC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
@@ -98,7 +97,6 @@ ap.CFLAGS += -DERROR_LED=4
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/mercury.makefile b/conf/autopilot/mercury.makefile
index 39f5ee647c..67cd7aed8e 100644
--- a/conf/autopilot/mercury.makefile
+++ b/conf/autopilot/mercury.makefile
@@ -44,7 +44,6 @@ SRC_CSC_ARCH=$(SRC_CSC)/$(ARCHI)
 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 @@ ap.CFLAGS += -DERROR_LED=4
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/mercury_csc.makefile b/conf/autopilot/mercury_csc.makefile
index 6e9c56eb53..f1a1f2ffe7 100644
--- a/conf/autopilot/mercury_csc.makefile
+++ b/conf/autopilot/mercury_csc.makefile
@@ -43,7 +43,6 @@ SRC_CSC=csc
 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 @@ ap.CFLAGS += -DERROR_LED=4
 # test uart
 #
 test_uart.ARCHDIR = $(ARCHI)
-test_uart.ARCH = arm7tdmi
 
 
 test_uart.CFLAGS += -I$(SRC_CSC)
@@ -119,7 +117,6 @@ test_uart.srcs += downlink.c pprz_transport.c
 #
 
 test_can1.ARCHDIR = $(ARCHI)
-test_can1.ARCH = arm7tdmi
 
 
 test_can1.CFLAGS += -I$(SRC_CSC)
diff --git a/conf/autopilot/rotorcraft.makefile b/conf/autopilot/rotorcraft.makefile
index a090509974..00466b8f69 100644
--- a/conf/autopilot/rotorcraft.makefile
+++ b/conf/autopilot/rotorcraft.makefile
@@ -47,7 +47,6 @@ BOOZ_INC = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD)
 
 ap.ARCHDIR = $(ARCHI)
 # this is supposedly ignored by the stm32 makefile
-ap.ARCH = arm7tdmi
 
 
 ap.CFLAGS += $(BOOZ_INC)
diff --git a/conf/autopilot/sitl.makefile b/conf/autopilot/sitl.makefile
index e95ff95000..979ae20109 100644
--- a/conf/autopilot/sitl.makefile
+++ b/conf/autopilot/sitl.makefile
@@ -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
 
diff --git a/conf/autopilot/sitl_jsbsim.makefile b/conf/autopilot/sitl_jsbsim.makefile
index 16e45a3dbc..beafd8bf38 100644
--- a/conf/autopilot/sitl_jsbsim.makefile
+++ b/conf/autopilot/sitl_jsbsim.makefile
@@ -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`
diff --git a/conf/autopilot/sitl_link_pprz.makefile b/conf/autopilot/sitl_link_pprz.makefile
index 489bc08785..361db797ae 100644
--- a/conf/autopilot/sitl_link_pprz.makefile
+++ b/conf/autopilot/sitl_link_pprz.makefile
@@ -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 
diff --git a/conf/autopilot/sitl_link_xbee.makefile b/conf/autopilot/sitl_link_xbee.makefile
index 295da156f7..286a3cf782 100644
--- a/conf/autopilot/sitl_link_xbee.makefile
+++ b/conf/autopilot/sitl_link_xbee.makefile
@@ -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 
diff --git a/conf/autopilot/subsystems/fixedwing/testing.makefile b/conf/autopilot/subsystems/fixedwing/testing.makefile
index a97ab95a9f..729e090a6d 100644
--- a/conf/autopilot/subsystems/fixedwing/testing.makefile
+++ b/conf/autopilot/subsystems/fixedwing/testing.makefile
@@ -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 @@ setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.
 
 # 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 @@ tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
 
 # 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 @@ test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SR
 
 # 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 += $(SRC_ARCH)/lpcusb/usbcontrol.c $(SRC_ARCH)/lpcusb/usbstdre
 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
diff --git a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
index c22bf4ee10..59ca92adc7 100644
--- a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
+++ b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
@@ -17,7 +17,6 @@ NPSDIR = $(SIMDIR)/nps
 
 
 sim.ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 
 sim.CFLAGS  += -DSITL
 sim.CFLAGS  += `pkg-config glib-2.0 --cflags` -I /usr/include/meschach
diff --git a/conf/autopilot/tiny.makefile b/conf/autopilot/tiny.makefile
index 7cc2689a31..5a18b1b257 100644
--- a/conf/autopilot/tiny.makefile
+++ b/conf/autopilot/tiny.makefile
@@ -4,10 +4,8 @@ ARCHI=arm7
 ARCH=arm7
 
 ap.ARCHDIR = $(ARCHI)
-ap.ARCH = arm7tdmi
 
 fbw.ARCHDIR = $(ARCHI)
-fbw.ARCH = arm7tdmi
 
 LPC21ISP_BAUD = 38400
 LPC21ISP_XTAL = 12000
@@ -28,7 +26,6 @@ ADC_GYRO_NB_SAMPLES = 16
 
 # 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 @@ setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.
 
 # 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 @@ tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
 
 # 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 @@ test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SR
 
 # 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 += $(SRC_ARCH)/lpcusb/usbcontrol.c $(SRC_ARCH)/lpcusb/usbstdre
 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
diff --git a/conf/boards/classix.makefile b/conf/boards/classix.makefile
index eda51cecc6..7130e88ac8 100644
--- a/conf/boards/classix.makefile
+++ b/conf/boards/classix.makefile
@@ -31,7 +31,6 @@ GPS_BAUD	= B38400
 
 # All targets on the TINY board run on the same processor achitecture
 $(TARGET).ARCHDIR = $(ARCHI)
-$(TARGET).ARCH = arm7tdmi
 
 # Battery Voltage
 fbw.CFLAGS +=  -DUSE_AD0
diff --git a/conf/boards/lisa_l_1.0.makefile b/conf/boards/lisa_l_1.0.makefile
index 61571c7bd2..4bc421e210 100644
--- a/conf/boards/lisa_l_1.0.makefile
+++ b/conf/boards/lisa_l_1.0.makefile
@@ -22,7 +22,6 @@ else
 
 	$(TARGET).ARCHDIR = $(ARCHI)
 # not needed?
-#	$(TARGET).ARCH = arm7tdmi
 
 endif
 # -----------------------------------------------------------------------
diff --git a/conf/boards/pc.makefile b/conf/boards/pc.makefile
index cce0ea9456..f534fcf558 100644
--- a/conf/boards/pc.makefile
+++ b/conf/boards/pc.makefile
@@ -15,5 +15,4 @@ BOARD_CFG = \"tiny.h\"
 
 
 $(TARGET).ARCHDIR = $(ARCHI)
-sim.ARCH = sitl
 
diff --git a/conf/boards/tiny_2.11.makefile b/conf/boards/tiny_2.11.makefile
index d67090feeb..60ccc4670c 100644
--- a/conf/boards/tiny_2.11.makefile
+++ b/conf/boards/tiny_2.11.makefile
@@ -44,5 +44,4 @@ ADC_GENERIC_NB_SAMPLES = 16
 
 # All targets on the TINY board run on the same processor achitecture
 $(TARGET).ARCHDIR = $(ARCHI)
-$(TARGET).ARCH = arm7tdmi
 
diff --git a/sw/tools/gen_aircraft.ml b/sw/tools/gen_aircraft.ml
index 244f708c9a..5c8df15422 100644
--- a/sw/tools/gen_aircraft.ml
+++ b/sw/tools/gen_aircraft.ml
@@ -261,7 +261,7 @@ let parse_targets = fun makefile_ac tag target ->
             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");