moved arm7 directory to arch/lpc21 and set most makefiles accordingly

Makefile

@@ -104,7 +104,7 @@ multimon:
 static_h: $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(DL_PROTOCOL_H) $(DL_PROTOCOL2_H)
 
 usb_lib:
-	@[ -d sw/airborne/arm7/lpcusb ] && ((test -x $(ARMGCC) && (cd sw/airborne/arm7/lpcusb; $(MAKE))) || echo "Not building usb_lib: ARMGCC=$(ARMGCC) not found") || echo "Not building usb_lib: sw/airborne/arm7/lpcusb directory missing"
+	@[ -d sw/airborne/arch/lpc21/lpcusb ] && ((test -x $(ARMGCC) && (cd sw/airborne/arch/lpc21/lpcusb; $(MAKE))) || echo "Not building usb_lib: ARMGCC=$(ARMGCC) not found") || echo "Not building usb_lib: sw/airborne/arch/lpc21/lpcusb directory missing"
 
 $(MESSAGES_H) : $(MESSAGES_XML) $(CONF_XML) tools
 	$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
@@ -152,17 +152,17 @@ ac_h ac1 ac2 ac3 ac fbw ap: static conf
 #
 # call with : make bl PROC=[TINY|FBW|AP|GENERIC]
 bl:
-	cd $(AIRBORNE)/arm7/test/bootloader; make clean; make 
+	cd $(AIRBORNE)/arch/lpc21/test/bootloader; make clean; make 
 
 BOOTLOADER_DEV=/dev/ttyUSB0
 upload_bl bl.upload: bl
-	lpc21isp -control $(AIRBORNE)/arm7/test/bootloader/bl.hex $(BOOTLOADER_DEV) 38400 12000
+	lpc21isp -control $(AIRBORNE)/arch/lpc21/test/bootloader/bl.hex $(BOOTLOADER_DEV) 38400 12000
 
 JTAG_INTERFACE = olimex-jtag-tiny.cfg
 #JTAG_INTERFACE = olimex-arm-usb-ocd.cfg
 
 upload_jtag: bl
-	openocd -f interface/$(JTAG_INTERFACE)  -f board/olimex_lpc_h2148.cfg -c init -c halt -c "flash write_image erase $(AIRBORNE)/arm7/test/bootloader/bl.hex"  -c reset -c shutdown
+	openocd -f interface/$(JTAG_INTERFACE)  -f board/olimex_lpc_h2148.cfg -c init -c halt -c "flash write_image erase $(AIRBORNE)/arch/lpc21/test/bootloader/bl.hex"  -c reset -c shutdown
 
 
 
@@ -170,15 +170,15 @@ lpc21iap:
 	cd sw/ground_segment/lpc21iap; make
 
 upgrade_bl bl.upgrade: bl lpc21iap
-	$(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap $(AIRBORNE)/arm7/test/bootloader/bl_ram.elf
-	$(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap $(AIRBORNE)/arm7/test/bootloader/bl.elf
+	$(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap $(AIRBORNE)/arch/lpc21/test/bootloader/bl_ram.elf
+	$(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap $(AIRBORNE)/arch/lpc21/test/bootloader/bl.elf
 
 ms:
-	cd $(AIRBORNE)/arm7/lpcusb; make
-	cd $(AIRBORNE)/arm7/lpcusb/examples; make 
+	cd $(AIRBORNE)/arch/lpc21/lpcusb; make
+	cd $(AIRBORNE)/arch/lpc21/lpcusb/examples; make 
 
 upload_ms ms.upload: ms
-	$(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap $(AIRBORNE)/arm7/lpcusb/examples/msc.elf
+	$(PAPARAZZI_SRC)/sw/ground_segment/lpc21iap/lpc21iap $(AIRBORNE)/arch/lpc21/lpcusb/examples/msc.elf
 
 #####
 #####

Makefile.ac

@@ -162,7 +162,7 @@ $(SETTINGS_MODULES) : $(MODULES_H)
 # Copy from Makefile, to get it in the paparazzi-bin package
 BOOTLOADER_DEVICE=/dev/ttyUSB0
 tiny_bl.upload:
-	lpc21isp -control $(AIRBORNE)/arm7/test/bootloader/bl.hex $(BOOTLOADER_DEVICE) 38400 12000
+	lpc21isp -control $(AIRBORNE)/arch/lpc21/test/bootloader/bl.hex $(BOOTLOADER_DEVICE) 38400 12000
 
 jsbsim jsbsim.compile: jsbsim.ac_h
 	cd $(AIRBORNE); $(MAKE) TARGET=jsbsim ARCHI=jsbsim ARCH=jsbsim all

conf/autopilot/fixedwing.makefile

@@ -10,7 +10,7 @@ CFG_FIXEDWING=$(PAPARAZZI_SRC)/conf/autopilot/subsystems/fixedwing
 
 
 SRC_FIXEDWING=.
-SRC_ARCH=$(SRC_FIXEDWING)/$(ARCH)
+SRC_ARCH=$(SRC_FIXEDWING)/arch/$(ARCH)
 SRC_FIXEDWING_TEST=$(SRC_FIXEDWING)/
 
 FIXEDWING_INC = -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH)

conf/autopilot/mercury_csc.makefile

@@ -22,7 +22,7 @@
 #
 #
 
-ARCHI=arm7
+ARCHI=lpc21
 
 FLASH_MODE = ISP
 LPC21ISP_PORT = /dev/ttyUSB0

conf/autopilot/rotorcraft.makefile

@@ -40,28 +40,29 @@ SRC_FIRMAWRE=firmwares/rotorcraft
 
 SRC_BOOZ_PRIV=booz_priv
 
+SRC_ARCH=arch/$(ARCH)
+
 CFG_BOOZ=$(PAPARAZZI_SRC)/conf/autopilot/
 
 BOOZ_INC = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD)
 
 
-ap.ARCHDIR = $(ARCHI)
-# this is supposedly ignored by the stm32 makefile
+ap.ARCHDIR = $(ARCH)
 
 
 ap.CFLAGS += $(BOOZ_INC)
 ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -DPERIPHERALS_AUTO_INIT
 ap.srcs    = $(SRC_FIRMAWRE)/main.c
 
-ifeq ($(ARCHI), stm32)
+ifeq ($(ARCH), stm32)
 ap.srcs += lisa/plug_sys.c
 endif
 #
 # Interrupts
 #
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.srcs += $(SRC_ARCH)/armVIC.c
-else ifeq ($(ARCHI), stm32)
+else ifeq ($(ARCH), stm32)
 ap.srcs += $(SRC_ARCH)/stm32_exceptions.c
 ap.srcs += $(SRC_ARCH)/stm32_vector_table.c
 endif
@@ -70,7 +71,7 @@ endif
 # LEDs
 #
 ap.CFLAGS += -DUSE_LED
-ifeq ($(ARCHI), stm32)
+ifeq ($(ARCH), stm32)
 ap.srcs += $(SRC_ARCH)/led_hw.c
 endif
 
@@ -80,7 +81,7 @@ endif
 ap.CFLAGS += -DUSE_SYS_TIME
 ap.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 ap.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))'
-ifeq ($(ARCHI), stm32)
+ifeq ($(ARCH), stm32)
 ap.CFLAGS += -DSYS_TIME_LED=$(SYS_TIME_LED)
 endif
 
@@ -98,7 +99,7 @@ ap.CFLAGS += -DPPRZ_UART=$(MODEM_PORT)
 ap.srcs   += $(SRC_BOOZ)/booz2_datalink.c
 ap.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD)
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -D$(MODEM_PORT)_VIC_SLOT=6
 endif
 
@@ -146,14 +147,14 @@ endif
 #
 # Analog Backend
 #
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DBOOZ2_ANALOG_BATTERY_PERIOD='SYS_TICS_OF_SEC((1./10.))'
 ap.srcs += $(SRC_BOOZ)/booz2_battery.c
 ap.CFLAGS += -DADC0_VIC_SLOT=2
 ap.CFLAGS += -DADC1_VIC_SLOT=3
 ap.srcs += $(SRC_BOOZ)/booz2_analog.c \
 		   $(SRC_BOOZ_ARCH)/booz2_analog_hw.c
-else ifeq ($(ARCHI), stm32)
+else ifeq ($(ARCH), stm32)
 ap.srcs += lisa/lisa_analog_plug.c
 endif
 

conf/autopilot/subsystems/fixedwing/actuators_direct.makefile

@@ -7,7 +7,7 @@ ap.srcs += $(SRC_ARCH)/servos_direct_hw.c $(SRC_FIXEDWING)/actuators.c
 # TODO TODO UGLY HACK: We re-use the booz actuators: Should become universal actuator code!!
 # Carefull: paths might get broken with this silly rotorcraft/fixedwing mixup of directories
 
-ifeq ($(ARCHI), stm32)
+ifeq ($(ARCH), stm32)
 ap.srcs    += $(SRC_FIXEDWING)/booz/arch/stm32/actuators/booz_actuators_pwm_arch.c
 ap.CFLAGS  += -I$(SRC_FIXEDWING)/booz/arch/stm32/
 endif

conf/autopilot/subsystems/fixedwing/autopilot.makefile

@@ -50,8 +50,8 @@ $(TARGET).CFLAGS 	+= -DTRAFFIC_INFO
 #
 
 $(TARGET).CFLAGS 	+= -DLED
-ifneq ($(ARCHI), arm7)
-  ifneq ($(ARCHI), jsbsim)
+ifneq ($(ARCH), lpc21)
+  ifneq ($(ARCH), jsbsim)
     $(TARGET).srcs 	+= $(SRC_ARCH)/led_hw.c
   endif
 endif
@@ -78,15 +78,15 @@ $(TARGET).srcs 		+= $(SRC_FIXEDWING)/inter_mcu.c
 # Interrupt Vectors
 #
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
   ns_srcs 		+= $(SRC_ARCH)/armVIC.c
-else ifeq ($(ARCHI), stm32)
+else ifeq ($(ARCH), stm32)
   ns_srcs 		+= $(SRC_ARCH)/stm32_exceptions.c
   ns_srcs 		+= $(SRC_ARCH)/stm32_vector_table.c
   ns_CFLAGS 		+= -DPERIPHERALS_AUTO_INIT
 endif
 
-ifeq ($(ARCHI), stm32)
+ifeq ($(ARCH), stm32)
   ns_srcs 		+= lisa/plug_sys.c
 endif
 
@@ -102,7 +102,7 @@ ns_srcs	   	+= $(SRC_FIXEDWING)/main.c
 #
 
 ns_CFLAGS 		+= -DUSE_LED
-ifeq ($(ARCHI), stm32)
+ifeq ($(ARCH), stm32)
   ns_CFLAGS 	+= -DSYS_TIME_LED=1
 else
   ns_CFLAGS 	+= -DTIME_LED=1
@@ -127,10 +127,10 @@ ns_srcs 		+= $(SRC_ARCH)/uart_hw.c
 # ANALOG
 #
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
   ns_CFLAGS 		+= -DADC
   ns_srcs 		+= $(SRC_ARCH)/adc_hw.c
-else ifeq ($(ARCHI), stm32)
+else ifeq ($(ARCH), stm32)
   ns_srcs 		+= lisa/lisa_analog_plug.c
 endif
 

conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile

@@ -12,13 +12,13 @@ endif
 ifeq ($(NORADIO), False)
   $(TARGET).CFLAGS 	+= -DRADIO_CONTROL
   $(TARGET).srcs 	+= $(SRC_FIXEDWING)/radio_control.c
-  ifneq ($(ARCHI),jsbsim)
+  ifneq ($(ARCH),jsbsim)
     $(TARGET).srcs 	+= $(SRC_ARCH)/ppm_hw.c
   endif
 endif
 
 
-ifeq ($(ARCHI),stm32)
+ifeq ($(ARCH),stm32)
   ap.CFLAGS  += -I$(SRC_FIXEDWING)/booz/
   ap.CFLAGS  += -I$(SRC_FIXEDWING)/booz/arch/stm32/
 

conf/autopilot/subsystems/fixedwing/testing.makefile

@@ -1,21 +1,21 @@
 ## TODO This file probably needs to move to the board specific folder
 
 # a test program to setup actuators
-setup_actuators.ARCHDIR = $(ARCHI)
+setup_actuators.ARCHDIR = $(ARCH)
 
 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
 
 
 # a test program to tunnel between both uart
-tunnel.ARCHDIR = $(ARCHI)
+tunnel.ARCHDIR = $(ARCH)
 
 tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DLED
 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
 
 
 # A test program to monitor the ADC values
-test_adcs.ARCHDIR = $(ARCHI)
+test_adcs.ARCHDIR = $(ARCH)
 
 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
@@ -26,7 +26,7 @@ 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.ARCHDIR = $(ARCH)
 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
@@ -34,7 +34,7 @@ usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbinit.c
 usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c $(SRC_ARCH)/lpcusb/usbstdreq.c
 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.ARCHDIR = $(ARCH)
 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

conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile

@@ -44,22 +44,20 @@ $(TARGET).CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
 $(TARGET).CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
 $(TARGET).CFLAGS += -DIMU_B2_VERSION_1_1
 $(TARGET).srcs += $(SRC_BOOZ)/booz_imu.c                   \
-           $(SRC_BOOZ)/imu/booz_imu_b2.c            \
-           $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
+		   $(SRC_BOOZ)/imu/booz_imu_b2.c            \
+		   $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
 
 $(TARGET).srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
+		   $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
 
 $(TARGET).srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
+		   $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
 
-# FIXME : that would lpc21
-#ifeq ($(ap.ARCH), arm7tmdi)
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 $(TARGET).CFLAGS += -DSSP_VIC_SLOT=9
 $(TARGET).CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
 $(TARGET).CFLAGS += -DMS2001_DRDY_VIC_SLOT=11
-else ifeq ($(ARCHI), stm32) 
+else ifeq ($(ARCH), stm32)
 $(TARGET).CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
 $(TARGET).CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
 $(TARGET).CFLAGS += -DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
@@ -73,12 +71,12 @@ sim.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
 sim.CFLAGS += -DIMU_B2_VERSION_1_1
 sim.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_AMI601
 sim.srcs += $(SRC_BOOZ)/booz_imu.c                 \
-            $(SRC_BOOZ)/imu/booz_imu_b2.c          \
-            $(SRC_BOOZ_SIM)/imu/booz_imu_b2_arch.c
+			$(SRC_BOOZ)/imu/booz_imu_b2.c          \
+			$(SRC_BOOZ_SIM)/imu/booz_imu_b2_arch.c
 
 
 sim.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-            $(SRC_BOOZ_SIM)/peripherals/booz_max1168_arch.c
+			$(SRC_BOOZ_SIM)/peripherals/booz_max1168_arch.c
 
 sim.CFLAGS += -DUSE_AMI601
 sim.srcs += $(SRC_BOOZ)/peripherals/booz_ami601.c

conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile

@@ -2,12 +2,12 @@
 ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c0
 ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
 endif
 
-ifeq ($(ARCHI), stm32) 
+ifeq ($(ARCH), stm32)
 ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
 ap.CFLAGS += -DUSE_I2C1
 endif

conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile

@@ -21,12 +21,12 @@ ap.CFLAGS += -DACTUATORS_ASCTEC_V2_PROTOCOL
 ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c0
 ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
 endif
 
-ifeq ($(ARCHI), stm32) 
+ifeq ($(ARCH), stm32)
 ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
 ap.CFLAGS += -DUSE_I2C1
 endif

conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile

@@ -30,10 +30,10 @@ ap.srcs += $(SRC_BOOZ)/actuators/booz_supervision.c
 ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_mkk.c
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DACTUATORS_MKK_DEVICE=i2c0
 ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
-else ifeq ($(ARCHI), stm32) 
+else ifeq ($(ARCH), stm32)
 ap.CFLAGS += -DACTUATORS_MKK_DEVICE=i2c1
 ap.CFLAGS += -DUSE_I2C1
 endif

conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile

@@ -16,7 +16,7 @@ SRC_BOARD=boards/$(BOARD)
 NPSDIR = $(SIMDIR)/nps
 
 
-sim.ARCHDIR = $(ARCHI)
+sim.ARCHDIR = $(ARCH)
 
 sim.CFLAGS  += -DSITL
 sim.CFLAGS  += `pkg-config glib-2.0 --cflags` -I /usr/include/meschach

conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile

@@ -6,7 +6,7 @@ ap.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c
 ap.CFLAGS += -DUSE_$(GPS_PORT) -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
 ap.CFLAGS += -DUSE_GPS -DGPS_LINK=$(GPS_PORT) -DGPS_LED=$(GPS_LED)
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -D$(GPS_PORT)_VIC_SLOT=5
 endif
 

conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile

@@ -6,7 +6,7 @@ ap.srcs += $(SRC_BOOZ)/gps/booz_gps_ubx.c
 ap.CFLAGS += -DUSE_$(GPS_PORT) -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
 ap.CFLAGS += -DUSE_GPS -DGPS_LINK=$(GPS_PORT) -DGPS_LED=$(GPS_LED)
 
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -D$(GPS_PORT)_VIC_SLOT=5
 endif
 

conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile

@@ -44,21 +44,20 @@ imu_CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
 imu_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
 imu_CFLAGS += -DIMU_B2_VERSION_1_1
 imu_srcs += $(SRC_BOOZ)/booz_imu.c                   \
-           $(SRC_BOOZ)/imu/booz_imu_b2.c            \
-           $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
+		   $(SRC_BOOZ)/imu/booz_imu_b2.c            \
+		   $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
 
 imu_srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
+		   $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
 
 imu_srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
+		   $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
 
-# FIXME : that would lpc21
-ifeq ($(ARCHI), arm7)
+ifeq ($(ARCH), lpc21)
 imu_CFLAGS += -DSSP_VIC_SLOT=9
 imu_CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
 imu_CFLAGS += -DMS2001_DRDY_VIC_SLOT=11
-else ifeq ($(ARCHI), stm32) 
+else ifeq ($(ARCH), stm32)
 imu_CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
 imu_CFLAGS += -DMAX_1168_DRDY_PORT=$(MAX_1168_DRDY_PORT)
 imu_CFLAGS += -DMAX_1168_DRDY_PORT_SOURCE=$(MAX_1168_DRDY_PORT_SOURCE)
@@ -77,12 +76,12 @@ sim.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
 sim.CFLAGS += -DIMU_B2_VERSION_1_1
 sim.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_AMI601
 sim.srcs += $(SRC_BOOZ)/booz_imu.c                 \
-            $(SRC_BOOZ)/imu/booz_imu_b2.c          \
-            $(SRC_BOOZ_SIM)/imu/booz_imu_b2_arch.c
+			$(SRC_BOOZ)/imu/booz_imu_b2.c          \
+			$(SRC_BOOZ_SIM)/imu/booz_imu_b2_arch.c
 
 
 sim.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-            $(SRC_BOOZ_SIM)/peripherals/booz_max1168_arch.c
+			$(SRC_BOOZ_SIM)/peripherals/booz_max1168_arch.c
 
 sim.CFLAGS += -DUSE_AMI601
 sim.srcs += $(SRC_BOOZ)/peripherals/booz_ami601.c

conf/autopilot/tiny.makefile

@@ -1,5 +1,10 @@
 # Makefile for the Tiny board (1 arm7tdmi, 1 LEA-LA)
 
+#
+# can we remove this file?
+# the makefiles under conf/boards/ should be used now
+#
+
 ARCHI=arm7
 ARCH=arm7
 

conf/boards/booz_1.0.makefile

@@ -4,7 +4,7 @@
 # http://paparazzi.enac.fr/wiki/Booz
 #
 ARCH=lpc21
-ARCHI=arm7
+ARCHI=lpc21
 BOARD=booz
 BOARD_VERSION=1.0
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"

conf/boards/classix.makefile

@@ -3,9 +3,8 @@
 #
 # http://paparazzi.enac.fr/wiki/Classix
 #
-# TODO: move all to new directories
-# ARCH=lpc21
-ARCH=arm7tdmi
+
+ARCH=lpc21
 ARCHI=arm7
 
 
@@ -30,7 +29,7 @@ LPC21ISP_XTAL = 12000
 GPS_BAUD	= B38400
 
 # All targets on the TINY board run on the same processor achitecture
-$(TARGET).ARCHDIR = $(ARCHI)
+$(TARGET).ARCHDIR = $(ARCH)
 
 # Battery Voltage
 fbw.CFLAGS +=  -DUSE_AD0

conf/boards/tiny_2.11.makefile

@@ -5,7 +5,7 @@
 #
 # TODO: move all to new directories
 # ARCH=lpc21
-ARCH=arm7
+ARCH=lpc21
 ARCHI=arm7
 
 
@@ -43,5 +43,5 @@ ADC_GYRO_NB_SAMPLES = 16
 ADC_GENERIC_NB_SAMPLES = 16
 
 # All targets on the TINY board run on the same processor achitecture
-$(TARGET).ARCHDIR = $(ARCHI)
+$(TARGET).ARCHDIR = $(ARCH)
 

sw/airborne/Makefile

@@ -26,9 +26,10 @@ OBJDIR = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/$(TARGET)
 VARINCLUDE=$(PAPARAZZI_HOME)/var/include
 ACINCLUDE = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)
 
-INCLUDES = -I $(PAPARAZZI_SRC)/sw/include -I $(PAPARAZZI_SRC)/sw/airborne -I $(PAPARAZZI_SRC)/conf/autopilot -I $(PAPARAZZI_SRC)/sw/airborne/$($(TARGET).ARCHDIR) -I $(VARINCLUDE) -I $(ACINCLUDE)
+INCLUDES = -I $(PAPARAZZI_SRC)/sw/include -I $(PAPARAZZI_SRC)/sw/airborne -I $(PAPARAZZI_SRC)/conf/autopilot -I $(PAPARAZZI_SRC)/sw/airborne/arch/$($(TARGET).ARCHDIR) -I $(VARINCLUDE) -I $(ACINCLUDE)
 
-SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/$(ARCHDIR)
+# doesn't seem to be used/needed
+#SRC_ARCH = $(PAPARAZZI_SRC)/sw/airborne/$(ARCHDIR)
 
 ifneq ($(MAKECMDGOALS),clean)
 include $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/Makefile.ac