From 03a9ab6fc0b04a09b14b68b4d8ccbb5836100f02 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Wed, 22 Sep 2010 23:23:55 +0000 Subject: [PATCH] moved arm7 directory to arch/lpc21 and set most makefiles accordingly --- Makefile | 18 ++++++------- Makefile.ac | 2 +- conf/autopilot/fixedwing.makefile | 2 +- conf/autopilot/mercury_csc.makefile | 2 +- conf/autopilot/rotorcraft.makefile | 21 ++++++++------- .../fixedwing/actuators_4015.makefile | 2 +- .../fixedwing/actuators_direct.makefile | 2 +- .../subsystems/fixedwing/autopilot.makefile | 16 ++++++------ .../fixedwing/radio_control_ppm.makefile | 4 +-- .../subsystems/fixedwing/testing.makefile | 10 +++---- .../lisa_passthrough/imu_b2_v1.1.makefile | 26 +++++++++---------- .../rotorcraft/actuators_asctec.makefile | 4 +-- .../rotorcraft/actuators_asctec_v2.makefile | 4 +-- .../rotorcraft/actuators_mkk.makefile | 4 +-- .../subsystems/rotorcraft/fdm_nps.makefile | 2 +- .../rotorcraft/gps_skytraq.makefile | 2 +- .../subsystems/rotorcraft/gps_ublox.makefile | 2 +- .../rotorcraft/imu_b2_v1.1.makefile | 25 +++++++++--------- conf/autopilot/tiny.makefile | 5 ++++ conf/boards/booz_1.0.makefile | 4 +-- conf/boards/classix.makefile | 7 +++-- conf/boards/tiny_2.11.makefile | 4 +-- sw/airborne/Makefile | 5 ++-- sw/airborne/{arm7 => arch/lpc21}/ADS8344.c | 0 sw/airborne/{arm7 => arch/lpc21}/ADS8344.h | 0 .../{arm7 => arch/lpc21}/LPC2129-ROM.ld | 0 .../{arm7 => arch/lpc21}/LPC2148-ROM-bl.ld | 0 .../{arm7 => arch/lpc21}/LPC2148-ROM.ld | 0 sw/airborne/{arm7 => arch/lpc21}/adc_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/adc_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/armVIC.c | 0 sw/airborne/{arm7 => arch/lpc21}/armVIC.h | 0 .../{arm7 => arch/lpc21}/baro_MS5534A.c | 0 .../{arm7 => arch/lpc21}/baro_MS5534A.h | 0 sw/airborne/{arm7 => arch/lpc21}/crt0.S | 0 .../{arm7 => arch/lpc21}/efsl/conf/config.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/debug.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/dir.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/disc.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/efs.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/error.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/extract.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/fat.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/file.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/fs.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/interface.h | 0 .../lpc21}/efsl/inc/interfaces/LPC2000_regs.h | 0 .../lpc21}/efsl/inc/interfaces/lpc2000_spi.h | 0 .../lpc21}/efsl/inc/interfaces/sd.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/ioman.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/ls.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/mkfs.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/partition.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/plibc.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/time.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/types.h | 0 .../{arm7 => arch/lpc21}/efsl/inc/ui.h | 0 .../{arm7 => arch/lpc21}/efsl/src/debug.c | 0 .../{arm7 => arch/lpc21}/efsl/src/dir.c | 0 .../{arm7 => arch/lpc21}/efsl/src/disc.c | 0 .../{arm7 => arch/lpc21}/efsl/src/efs.c | 0 .../{arm7 => arch/lpc21}/efsl/src/extract.c | 0 .../{arm7 => arch/lpc21}/efsl/src/fat.c | 0 .../{arm7 => arch/lpc21}/efsl/src/file.c | 0 .../{arm7 => arch/lpc21}/efsl/src/fs.c | 0 .../lpc21}/efsl/src/interfaces/lpc2000_spi.c | 0 .../lpc21}/efsl/src/interfaces/sd.c | 0 .../{arm7 => arch/lpc21}/efsl/src/ioman.c | 0 .../{arm7 => arch/lpc21}/efsl/src/ls.c | 0 .../{arm7 => arch/lpc21}/efsl/src/mkfs.c | 0 .../{arm7 => arch/lpc21}/efsl/src/partition.c | 0 .../{arm7 => arch/lpc21}/efsl/src/plibc.c | 0 .../{arm7 => arch/lpc21}/efsl/src/time.c | 0 .../{arm7 => arch/lpc21}/efsl/src/ui.c | 0 sw/airborne/{arm7 => arch/lpc21}/gpio.c | 0 sw/airborne/{arm7 => arch/lpc21}/gpio.h | 0 sw/airborne/{arm7 => arch/lpc21}/gps_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/i2c_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/i2c_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/icp_scale.h | 0 .../{arm7 => arch/lpc21}/include/LPC21xx.h | 0 .../{arm7 => arch/lpc21}/include/lpcADC.h | 0 .../{arm7 => arch/lpc21}/include/lpcCAN.h | 0 .../{arm7 => arch/lpc21}/include/lpcEMC.h | 0 .../{arm7 => arch/lpc21}/include/lpcGPIO.h | 0 .../{arm7 => arch/lpc21}/include/lpcI2C.h | 0 .../{arm7 => arch/lpc21}/include/lpcPIN.h | 0 .../{arm7 => arch/lpc21}/include/lpcRTC.h | 0 .../{arm7 => arch/lpc21}/include/lpcSCB.h | 0 .../{arm7 => arch/lpc21}/include/lpcSPI.h | 0 .../{arm7 => arch/lpc21}/include/lpcTMR.h | 0 .../{arm7 => arch/lpc21}/include/lpcUART.h | 0 .../{arm7 => arch/lpc21}/include/lpcVIC.h | 0 .../{arm7 => arch/lpc21}/include/lpcWD.h | 0 .../{arm7 => arch/lpc21}/include/types.h | 0 sw/airborne/{arm7 => arch/lpc21}/init_hw.h | 0 .../{arm7 => arch/lpc21}/interrupt_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/inttypes.h | 0 sw/airborne/{arm7 => arch/lpc21}/led_hw.h | 0 .../{arm7 => arch/lpc21}/link_mcu_hw.h | 0 .../{arm7 => arch/lpc21}/lpcusb/CHANGELOG | 0 .../{arm7 => arch/lpc21}/lpcusb/Doxyfile | 0 .../{arm7 => arch/lpc21}/lpcusb/Makefile | 0 .../lpc21}/lpcusb/examples/Makefile | 0 .../lpc21}/lpcusb/examples/armVIC.c | 0 .../lpc21}/lpcusb/examples/armVIC.h | 0 .../lpc21}/lpcusb/examples/blockdev.h | 0 .../lpc21}/lpcusb/examples/blockdev_sd.c | 0 .../lpc21}/lpcusb/examples/console.c | 0 .../lpc21}/lpcusb/examples/console.h | 0 .../lpc21}/lpcusb/examples/crt.s | 0 .../lpc21}/lpcusb/examples/lpc2000_spi.c | 0 .../lpc21}/lpcusb/examples/lpc2000_spi0.c | 0 .../lpc21}/lpcusb/examples/lpc2148-ram.ld | 0 .../lpc21}/lpcusb/examples/lpc2148-rom-hi.ld | 0 .../lpc21}/lpcusb/examples/lpc2148-rom.ld | 0 .../lpc21}/lpcusb/examples/main_msc.c | 0 .../lpc21}/lpcusb/examples/msc_bot.c | 0 .../lpc21}/lpcusb/examples/msc_bot.h | 0 .../lpc21}/lpcusb/examples/msc_scsi.c | 0 .../lpc21}/lpcusb/examples/msc_scsi.h | 0 .../lpc21}/lpcusb/examples/printf.c | 0 .../lpc21}/lpcusb/examples/spi.h | 0 .../lpc21}/lpcusb/examples/startup.c | 0 .../lpc21}/lpcusb/examples/startup.h | 0 .../{arm7 => arch/lpc21}/lpcusb/type.h | 0 .../{arm7 => arch/lpc21}/lpcusb/usbapi.h | 0 .../{arm7 => arch/lpc21}/lpcusb/usbcontrol.c | 0 .../{arm7 => arch/lpc21}/lpcusb/usbdebug.h | 0 .../{arm7 => arch/lpc21}/lpcusb/usbhw_lpc.c | 0 .../{arm7 => arch/lpc21}/lpcusb/usbhw_lpc.h | 0 .../{arm7 => arch/lpc21}/lpcusb/usbinit.c | 0 .../{arm7 => arch/lpc21}/lpcusb/usbstdreq.c | 0 .../{arm7 => arch/lpc21}/lpcusb/usbstruct.h | 0 .../{arm7 => arch/lpc21}/max11040_hw.c | 0 .../{arm7 => arch/lpc21}/max11040_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/max1167_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/max1167_hw.h | 0 .../{arm7 => arch/lpc21}/micromag_fw_hw.c | 0 .../{arm7 => arch/lpc21}/micromag_fw_hw.h | 0 .../{arm7 => arch/lpc21}/micromag_hw.c | 0 .../{arm7 => arch/lpc21}/micromag_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/modem_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/modem_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/ppm_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/ppm_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/pwm_input.c | 0 sw/airborne/{arm7 => arch/lpc21}/pwm_input.h | 0 sw/airborne/{arm7 => arch/lpc21}/scp1000_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/scp1000_hw.h | 0 .../{arm7 => arch/lpc21}/servos_4015_MAT_hw.c | 0 .../{arm7 => arch/lpc21}/servos_4015_MAT_hw.h | 0 .../{arm7 => arch/lpc21}/servos_4015_hw.c | 0 .../{arm7 => arch/lpc21}/servos_4015_hw.h | 0 .../{arm7 => arch/lpc21}/servos_4015_hw_new.c | 0 .../{arm7 => arch/lpc21}/servos_4017_hw.c | 0 .../{arm7 => arch/lpc21}/servos_4017_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/servos_csc.c | 0 sw/airborne/{arm7 => arch/lpc21}/servos_csc.h | 0 .../{arm7 => arch/lpc21}/servos_direct_hw.c | 0 .../{arm7 => arch/lpc21}/servos_direct_hw.h | 0 .../{arm7 => arch/lpc21}/servos_ppm_hw.c | 0 .../{arm7 => arch/lpc21}/servos_ppm_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/spi_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/spi_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/ssp_hw.h | 0 .../{arm7 => arch/lpc21}/sys_time_hw.c | 0 .../{arm7 => arch/lpc21}/sys_time_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/tacho_mb.c | 0 sw/airborne/{arm7 => arch/lpc21}/tacho_mb.h | 0 .../lpc21}/test/LPC2138-ROM-bl.ld | 0 .../{arm7 => arch/lpc21}/test/LPC2138-ROM.ld | 0 .../{arm7 => arch/lpc21}/test/Makefile | 0 .../lpc21}/test/bootloader/Makefile | 0 .../lpc21}/test/bootloader/bootloader.c | 0 .../lpc21}/test/bootloader/console.c | 0 .../lpc21}/test/bootloader/console.h | 0 .../lpc21}/test/bootloader/crt.S | 0 .../lpc21}/test/bootloader/flash.sh | 0 .../lpc21}/test/bootloader/lpc2148-ram.ld | 0 .../lpc21}/test/bootloader/lpc2148-rom-hi.ld | 0 .../lpc21}/test/bootloader/lpc2148-rom.ld | 0 .../lpc21}/test/bootloader/lpc21iap.h | 0 .../lpc21}/test/bootloader/printf.c | 0 .../lpc21}/test/bootloader/startup.c | 0 .../lpc21}/test/bootloader/startup.h | 0 .../lpc21}/test/bootloader/type.h | 0 .../lpc21}/test/bootloader/usbapi.h | 0 .../lpc21}/test/bootloader/usbcontrol.c | 0 .../lpc21}/test/bootloader/usbdebug.h | 0 .../lpc21}/test/bootloader/usbdescrip.c | 0 .../lpc21}/test/bootloader/usbhw_lpc.c | 0 .../lpc21}/test/bootloader/usbhw_lpc.h | 0 .../lpc21}/test/bootloader/usbinit.c | 0 .../lpc21}/test/bootloader/usbstdreq.c | 0 .../lpc21}/test/bootloader/usbstruct.h | 0 sw/airborne/{arm7 => arch/lpc21}/test/crt0.S | 0 .../{arm7 => arch/lpc21}/test/dev_board.h | 0 .../{arm7 => arch/lpc21}/test/inttypes.h | 0 .../{arm7 => arch/lpc21}/test/ledswitch.c | 0 .../{arm7 => arch/lpc21}/test/lpc2138.h | 0 .../{arm7 => arch/lpc21}/test/lpc21xx.h | 0 sw/airborne/{arm7 => arch/lpc21}/test/timer.c | 0 sw/airborne/{arm7 => arch/lpc21}/test/uart.c | 0 .../{arm7 => arch/lpc21}/test/uart_tunnel.c | 0 .../{arm7 => arch/lpc21}/test/welcome.h | 0 .../{arm7 => arch/lpc21}/trig_ext_hw.c | 0 .../{arm7 => arch/lpc21}/trig_ext_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/uart_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/uart_hw.h | 0 .../{arm7 => arch/lpc21}/uart_tunnel.c | 0 sw/airborne/{arm7 => arch/lpc21}/usb_msc_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/usb_msc_hw.h | 0 sw/airborne/{arm7 => arch/lpc21}/usb_ser_hw.c | 0 sw/airborne/{arm7 => arch/lpc21}/usb_tunnel.c | 0 .../{arm7 => arch/lpc21}/vic_slots.txt | 0 216 files changed, 88 insertions(+), 85 deletions(-) rename sw/airborne/{arm7 => arch/lpc21}/ADS8344.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/ADS8344.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/LPC2129-ROM.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/LPC2148-ROM-bl.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/LPC2148-ROM.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/adc_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/adc_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/armVIC.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/armVIC.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/baro_MS5534A.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/baro_MS5534A.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/crt0.S (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/conf/config.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/debug.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/dir.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/disc.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/efs.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/error.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/extract.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/fat.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/file.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/fs.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/interface.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/interfaces/LPC2000_regs.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/interfaces/lpc2000_spi.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/interfaces/sd.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/ioman.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/ls.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/mkfs.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/partition.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/plibc.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/time.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/types.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/inc/ui.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/debug.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/dir.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/disc.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/efs.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/extract.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/fat.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/file.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/fs.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/interfaces/lpc2000_spi.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/interfaces/sd.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/ioman.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/ls.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/mkfs.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/partition.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/plibc.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/time.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/efsl/src/ui.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/gpio.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/gpio.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/gps_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/i2c_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/i2c_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/icp_scale.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/LPC21xx.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcADC.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcCAN.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcEMC.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcGPIO.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcI2C.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcPIN.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcRTC.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcSCB.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcSPI.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcTMR.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcUART.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcVIC.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/lpcWD.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/include/types.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/init_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/interrupt_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/inttypes.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/led_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/link_mcu_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/CHANGELOG (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/Doxyfile (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/Makefile (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/Makefile (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/armVIC.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/armVIC.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/blockdev.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/blockdev_sd.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/console.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/console.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/crt.s (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/lpc2000_spi.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/lpc2000_spi0.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/lpc2148-ram.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/lpc2148-rom-hi.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/lpc2148-rom.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/main_msc.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/msc_bot.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/msc_bot.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/msc_scsi.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/msc_scsi.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/printf.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/spi.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/startup.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/examples/startup.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/type.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbapi.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbcontrol.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbdebug.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbhw_lpc.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbhw_lpc.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbinit.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbstdreq.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/lpcusb/usbstruct.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/max11040_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/max11040_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/max1167_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/max1167_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/micromag_fw_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/micromag_fw_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/micromag_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/micromag_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/modem_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/modem_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/ppm_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/ppm_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/pwm_input.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/pwm_input.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/scp1000_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/scp1000_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_4015_MAT_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_4015_MAT_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_4015_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_4015_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_4015_hw_new.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_4017_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_4017_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_csc.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_csc.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_direct_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_direct_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_ppm_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/servos_ppm_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/spi_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/spi_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/ssp_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/sys_time_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/sys_time_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/tacho_mb.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/tacho_mb.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/LPC2138-ROM-bl.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/LPC2138-ROM.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/Makefile (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/Makefile (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/bootloader.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/console.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/console.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/crt.S (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/flash.sh (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/lpc2148-ram.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/lpc2148-rom-hi.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/lpc2148-rom.ld (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/lpc21iap.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/printf.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/startup.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/startup.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/type.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbapi.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbcontrol.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbdebug.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbdescrip.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbhw_lpc.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbhw_lpc.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbinit.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbstdreq.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/bootloader/usbstruct.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/crt0.S (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/dev_board.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/inttypes.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/ledswitch.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/lpc2138.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/lpc21xx.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/timer.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/uart.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/uart_tunnel.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/test/welcome.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/trig_ext_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/trig_ext_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/uart_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/uart_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/uart_tunnel.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/usb_msc_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/usb_msc_hw.h (100%) rename sw/airborne/{arm7 => arch/lpc21}/usb_ser_hw.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/usb_tunnel.c (100%) rename sw/airborne/{arm7 => arch/lpc21}/vic_slots.txt (100%) diff --git a/Makefile b/Makefile index 6b1770003f..1b5e761fd5 100644 --- a/Makefile +++ b/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 ##### ##### diff --git a/Makefile.ac b/Makefile.ac index 4103a87827..eb92c4ad8a 100644 --- a/Makefile.ac +++ b/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 diff --git a/conf/autopilot/fixedwing.makefile b/conf/autopilot/fixedwing.makefile index 0e47e04d7c..7e9603066e 100644 --- a/conf/autopilot/fixedwing.makefile +++ b/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) diff --git a/conf/autopilot/mercury_csc.makefile b/conf/autopilot/mercury_csc.makefile index f1a1f2ffe7..ec72617e23 100644 --- a/conf/autopilot/mercury_csc.makefile +++ b/conf/autopilot/mercury_csc.makefile @@ -22,7 +22,7 @@ # # -ARCHI=arm7 +ARCHI=lpc21 FLASH_MODE = ISP LPC21ISP_PORT = /dev/ttyUSB0 diff --git a/conf/autopilot/rotorcraft.makefile b/conf/autopilot/rotorcraft.makefile index 00466b8f69..bb57e05d19 100644 --- a/conf/autopilot/rotorcraft.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile b/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile index 8bc9241f0f..793add2d01 100644 --- a/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile +++ b/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile @@ -1,6 +1,6 @@ # for Tiny v1.1 ap.CFLAGS += -DACTUATORS=\"servos_4015_MAT_hw.h\" -DSERVOS_4015_MAT -ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c +ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c ap.srcs += $(SRC_FIXEDWING)/actuators.c diff --git a/conf/autopilot/subsystems/fixedwing/actuators_direct.makefile b/conf/autopilot/subsystems/fixedwing/actuators_direct.makefile index d89f9c5cb4..bedefbdf33 100644 --- a/conf/autopilot/subsystems/fixedwing/actuators_direct.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/fixedwing/autopilot.makefile b/conf/autopilot/subsystems/fixedwing/autopilot.makefile index 55f78f82f7..4223691ff0 100644 --- a/conf/autopilot/subsystems/fixedwing/autopilot.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile b/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile index d185a48f18..a22389d46d 100644 --- a/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile +++ b/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/ diff --git a/conf/autopilot/subsystems/fixedwing/testing.makefile b/conf/autopilot/subsystems/fixedwing/testing.makefile index 729e090a6d..734699c308 100644 --- a/conf/autopilot/subsystems/fixedwing/testing.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile b/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile index b2aa14a4de..961c00a7aa 100644 --- a/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile +++ b/conf/autopilot/subsystems/lisa_passthrough/imu_b2_v1.1.makefile @@ -12,7 +12,7 @@ # # # -# +# # # # @@ -22,13 +22,13 @@ # # # -# +# # # # # # -# +# # # # @@ -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 diff --git a/conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile b/conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile index dea950a0d5..d040138a52 100644 --- a/conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile b/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile index 3c0e4febdf..f1fafed1c4 100644 --- a/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile b/conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile index 80e0b43851..35967e7ac6 100644 --- a/conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile b/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile index 59ca92adc7..efb3495fc0 100644 --- a/conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile b/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile index f9d0fb6b7c..a7fd1910b0 100644 --- a/conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile b/conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile index 5e790091f7..cccf6c71d5 100644 --- a/conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile +++ b/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 diff --git a/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile b/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile index eafef8c903..4ffea67bc4 100644 --- a/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile +++ b/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile @@ -12,7 +12,7 @@ # # # -# +# # # # @@ -22,13 +22,13 @@ # # # -# +# # # # # # -# +# # # # @@ -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 diff --git a/conf/autopilot/tiny.makefile b/conf/autopilot/tiny.makefile index 5a18b1b257..f391d2b68a 100644 --- a/conf/autopilot/tiny.makefile +++ b/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 diff --git a/conf/boards/booz_1.0.makefile b/conf/boards/booz_1.0.makefile index 4fe7600817..548891993b 100644 --- a/conf/boards/booz_1.0.makefile +++ b/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\" @@ -33,4 +33,4 @@ AHRS_ALIGNER_LED = 3 GPS_PORT=UART0 GPS_BAUD=B38400 -GPS_LED=4 \ No newline at end of file +GPS_LED=4 diff --git a/conf/boards/classix.makefile b/conf/boards/classix.makefile index 7130e88ac8..b2804578ce 100644 --- a/conf/boards/classix.makefile +++ b/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 diff --git a/conf/boards/tiny_2.11.makefile b/conf/boards/tiny_2.11.makefile index 60ccc4670c..105be4821a 100644 --- a/conf/boards/tiny_2.11.makefile +++ b/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) diff --git a/sw/airborne/Makefile b/sw/airborne/Makefile index c2f2e5427f..0adda875b2 100644 --- a/sw/airborne/Makefile +++ b/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 diff --git a/sw/airborne/arm7/ADS8344.c b/sw/airborne/arch/lpc21/ADS8344.c similarity index 100% rename from sw/airborne/arm7/ADS8344.c rename to sw/airborne/arch/lpc21/ADS8344.c diff --git a/sw/airborne/arm7/ADS8344.h b/sw/airborne/arch/lpc21/ADS8344.h similarity index 100% rename from sw/airborne/arm7/ADS8344.h rename to sw/airborne/arch/lpc21/ADS8344.h diff --git a/sw/airborne/arm7/LPC2129-ROM.ld b/sw/airborne/arch/lpc21/LPC2129-ROM.ld similarity index 100% rename from sw/airborne/arm7/LPC2129-ROM.ld rename to sw/airborne/arch/lpc21/LPC2129-ROM.ld diff --git a/sw/airborne/arm7/LPC2148-ROM-bl.ld b/sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld similarity index 100% rename from sw/airborne/arm7/LPC2148-ROM-bl.ld rename to sw/airborne/arch/lpc21/LPC2148-ROM-bl.ld diff --git a/sw/airborne/arm7/LPC2148-ROM.ld b/sw/airborne/arch/lpc21/LPC2148-ROM.ld similarity index 100% rename from sw/airborne/arm7/LPC2148-ROM.ld rename to sw/airborne/arch/lpc21/LPC2148-ROM.ld diff --git a/sw/airborne/arm7/adc_hw.c b/sw/airborne/arch/lpc21/adc_hw.c similarity index 100% rename from sw/airborne/arm7/adc_hw.c rename to sw/airborne/arch/lpc21/adc_hw.c diff --git a/sw/airborne/arm7/adc_hw.h b/sw/airborne/arch/lpc21/adc_hw.h similarity index 100% rename from sw/airborne/arm7/adc_hw.h rename to sw/airborne/arch/lpc21/adc_hw.h diff --git a/sw/airborne/arm7/armVIC.c b/sw/airborne/arch/lpc21/armVIC.c similarity index 100% rename from sw/airborne/arm7/armVIC.c rename to sw/airborne/arch/lpc21/armVIC.c diff --git a/sw/airborne/arm7/armVIC.h b/sw/airborne/arch/lpc21/armVIC.h similarity index 100% rename from sw/airborne/arm7/armVIC.h rename to sw/airborne/arch/lpc21/armVIC.h diff --git a/sw/airborne/arm7/baro_MS5534A.c b/sw/airborne/arch/lpc21/baro_MS5534A.c similarity index 100% rename from sw/airborne/arm7/baro_MS5534A.c rename to sw/airborne/arch/lpc21/baro_MS5534A.c diff --git a/sw/airborne/arm7/baro_MS5534A.h b/sw/airborne/arch/lpc21/baro_MS5534A.h similarity index 100% rename from sw/airborne/arm7/baro_MS5534A.h rename to sw/airborne/arch/lpc21/baro_MS5534A.h diff --git a/sw/airborne/arm7/crt0.S b/sw/airborne/arch/lpc21/crt0.S similarity index 100% rename from sw/airborne/arm7/crt0.S rename to sw/airborne/arch/lpc21/crt0.S diff --git a/sw/airborne/arm7/efsl/conf/config.h b/sw/airborne/arch/lpc21/efsl/conf/config.h similarity index 100% rename from sw/airborne/arm7/efsl/conf/config.h rename to sw/airborne/arch/lpc21/efsl/conf/config.h diff --git a/sw/airborne/arm7/efsl/inc/debug.h b/sw/airborne/arch/lpc21/efsl/inc/debug.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/debug.h rename to sw/airborne/arch/lpc21/efsl/inc/debug.h diff --git a/sw/airborne/arm7/efsl/inc/dir.h b/sw/airborne/arch/lpc21/efsl/inc/dir.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/dir.h rename to sw/airborne/arch/lpc21/efsl/inc/dir.h diff --git a/sw/airborne/arm7/efsl/inc/disc.h b/sw/airborne/arch/lpc21/efsl/inc/disc.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/disc.h rename to sw/airborne/arch/lpc21/efsl/inc/disc.h diff --git a/sw/airborne/arm7/efsl/inc/efs.h b/sw/airborne/arch/lpc21/efsl/inc/efs.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/efs.h rename to sw/airborne/arch/lpc21/efsl/inc/efs.h diff --git a/sw/airborne/arm7/efsl/inc/error.h b/sw/airborne/arch/lpc21/efsl/inc/error.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/error.h rename to sw/airborne/arch/lpc21/efsl/inc/error.h diff --git a/sw/airborne/arm7/efsl/inc/extract.h b/sw/airborne/arch/lpc21/efsl/inc/extract.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/extract.h rename to sw/airborne/arch/lpc21/efsl/inc/extract.h diff --git a/sw/airborne/arm7/efsl/inc/fat.h b/sw/airborne/arch/lpc21/efsl/inc/fat.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/fat.h rename to sw/airborne/arch/lpc21/efsl/inc/fat.h diff --git a/sw/airborne/arm7/efsl/inc/file.h b/sw/airborne/arch/lpc21/efsl/inc/file.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/file.h rename to sw/airborne/arch/lpc21/efsl/inc/file.h diff --git a/sw/airborne/arm7/efsl/inc/fs.h b/sw/airborne/arch/lpc21/efsl/inc/fs.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/fs.h rename to sw/airborne/arch/lpc21/efsl/inc/fs.h diff --git a/sw/airborne/arm7/efsl/inc/interface.h b/sw/airborne/arch/lpc21/efsl/inc/interface.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/interface.h rename to sw/airborne/arch/lpc21/efsl/inc/interface.h diff --git a/sw/airborne/arm7/efsl/inc/interfaces/LPC2000_regs.h b/sw/airborne/arch/lpc21/efsl/inc/interfaces/LPC2000_regs.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/interfaces/LPC2000_regs.h rename to sw/airborne/arch/lpc21/efsl/inc/interfaces/LPC2000_regs.h diff --git a/sw/airborne/arm7/efsl/inc/interfaces/lpc2000_spi.h b/sw/airborne/arch/lpc21/efsl/inc/interfaces/lpc2000_spi.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/interfaces/lpc2000_spi.h rename to sw/airborne/arch/lpc21/efsl/inc/interfaces/lpc2000_spi.h diff --git a/sw/airborne/arm7/efsl/inc/interfaces/sd.h b/sw/airborne/arch/lpc21/efsl/inc/interfaces/sd.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/interfaces/sd.h rename to sw/airborne/arch/lpc21/efsl/inc/interfaces/sd.h diff --git a/sw/airborne/arm7/efsl/inc/ioman.h b/sw/airborne/arch/lpc21/efsl/inc/ioman.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/ioman.h rename to sw/airborne/arch/lpc21/efsl/inc/ioman.h diff --git a/sw/airborne/arm7/efsl/inc/ls.h b/sw/airborne/arch/lpc21/efsl/inc/ls.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/ls.h rename to sw/airborne/arch/lpc21/efsl/inc/ls.h diff --git a/sw/airborne/arm7/efsl/inc/mkfs.h b/sw/airborne/arch/lpc21/efsl/inc/mkfs.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/mkfs.h rename to sw/airborne/arch/lpc21/efsl/inc/mkfs.h diff --git a/sw/airborne/arm7/efsl/inc/partition.h b/sw/airborne/arch/lpc21/efsl/inc/partition.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/partition.h rename to sw/airborne/arch/lpc21/efsl/inc/partition.h diff --git a/sw/airborne/arm7/efsl/inc/plibc.h b/sw/airborne/arch/lpc21/efsl/inc/plibc.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/plibc.h rename to sw/airborne/arch/lpc21/efsl/inc/plibc.h diff --git a/sw/airborne/arm7/efsl/inc/time.h b/sw/airborne/arch/lpc21/efsl/inc/time.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/time.h rename to sw/airborne/arch/lpc21/efsl/inc/time.h diff --git a/sw/airborne/arm7/efsl/inc/types.h b/sw/airborne/arch/lpc21/efsl/inc/types.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/types.h rename to sw/airborne/arch/lpc21/efsl/inc/types.h diff --git a/sw/airborne/arm7/efsl/inc/ui.h b/sw/airborne/arch/lpc21/efsl/inc/ui.h similarity index 100% rename from sw/airborne/arm7/efsl/inc/ui.h rename to sw/airborne/arch/lpc21/efsl/inc/ui.h diff --git a/sw/airborne/arm7/efsl/src/debug.c b/sw/airborne/arch/lpc21/efsl/src/debug.c similarity index 100% rename from sw/airborne/arm7/efsl/src/debug.c rename to sw/airborne/arch/lpc21/efsl/src/debug.c diff --git a/sw/airborne/arm7/efsl/src/dir.c b/sw/airborne/arch/lpc21/efsl/src/dir.c similarity index 100% rename from sw/airborne/arm7/efsl/src/dir.c rename to sw/airborne/arch/lpc21/efsl/src/dir.c diff --git a/sw/airborne/arm7/efsl/src/disc.c b/sw/airborne/arch/lpc21/efsl/src/disc.c similarity index 100% rename from sw/airborne/arm7/efsl/src/disc.c rename to sw/airborne/arch/lpc21/efsl/src/disc.c diff --git a/sw/airborne/arm7/efsl/src/efs.c b/sw/airborne/arch/lpc21/efsl/src/efs.c similarity index 100% rename from sw/airborne/arm7/efsl/src/efs.c rename to sw/airborne/arch/lpc21/efsl/src/efs.c diff --git a/sw/airborne/arm7/efsl/src/extract.c b/sw/airborne/arch/lpc21/efsl/src/extract.c similarity index 100% rename from sw/airborne/arm7/efsl/src/extract.c rename to sw/airborne/arch/lpc21/efsl/src/extract.c diff --git a/sw/airborne/arm7/efsl/src/fat.c b/sw/airborne/arch/lpc21/efsl/src/fat.c similarity index 100% rename from sw/airborne/arm7/efsl/src/fat.c rename to sw/airborne/arch/lpc21/efsl/src/fat.c diff --git a/sw/airborne/arm7/efsl/src/file.c b/sw/airborne/arch/lpc21/efsl/src/file.c similarity index 100% rename from sw/airborne/arm7/efsl/src/file.c rename to sw/airborne/arch/lpc21/efsl/src/file.c diff --git a/sw/airborne/arm7/efsl/src/fs.c b/sw/airborne/arch/lpc21/efsl/src/fs.c similarity index 100% rename from sw/airborne/arm7/efsl/src/fs.c rename to sw/airborne/arch/lpc21/efsl/src/fs.c diff --git a/sw/airborne/arm7/efsl/src/interfaces/lpc2000_spi.c b/sw/airborne/arch/lpc21/efsl/src/interfaces/lpc2000_spi.c similarity index 100% rename from sw/airborne/arm7/efsl/src/interfaces/lpc2000_spi.c rename to sw/airborne/arch/lpc21/efsl/src/interfaces/lpc2000_spi.c diff --git a/sw/airborne/arm7/efsl/src/interfaces/sd.c b/sw/airborne/arch/lpc21/efsl/src/interfaces/sd.c similarity index 100% rename from sw/airborne/arm7/efsl/src/interfaces/sd.c rename to sw/airborne/arch/lpc21/efsl/src/interfaces/sd.c diff --git a/sw/airborne/arm7/efsl/src/ioman.c b/sw/airborne/arch/lpc21/efsl/src/ioman.c similarity index 100% rename from sw/airborne/arm7/efsl/src/ioman.c rename to sw/airborne/arch/lpc21/efsl/src/ioman.c diff --git a/sw/airborne/arm7/efsl/src/ls.c b/sw/airborne/arch/lpc21/efsl/src/ls.c similarity index 100% rename from sw/airborne/arm7/efsl/src/ls.c rename to sw/airborne/arch/lpc21/efsl/src/ls.c diff --git a/sw/airborne/arm7/efsl/src/mkfs.c b/sw/airborne/arch/lpc21/efsl/src/mkfs.c similarity index 100% rename from sw/airborne/arm7/efsl/src/mkfs.c rename to sw/airborne/arch/lpc21/efsl/src/mkfs.c diff --git a/sw/airborne/arm7/efsl/src/partition.c b/sw/airborne/arch/lpc21/efsl/src/partition.c similarity index 100% rename from sw/airborne/arm7/efsl/src/partition.c rename to sw/airborne/arch/lpc21/efsl/src/partition.c diff --git a/sw/airborne/arm7/efsl/src/plibc.c b/sw/airborne/arch/lpc21/efsl/src/plibc.c similarity index 100% rename from sw/airborne/arm7/efsl/src/plibc.c rename to sw/airborne/arch/lpc21/efsl/src/plibc.c diff --git a/sw/airborne/arm7/efsl/src/time.c b/sw/airborne/arch/lpc21/efsl/src/time.c similarity index 100% rename from sw/airborne/arm7/efsl/src/time.c rename to sw/airborne/arch/lpc21/efsl/src/time.c diff --git a/sw/airborne/arm7/efsl/src/ui.c b/sw/airborne/arch/lpc21/efsl/src/ui.c similarity index 100% rename from sw/airborne/arm7/efsl/src/ui.c rename to sw/airborne/arch/lpc21/efsl/src/ui.c diff --git a/sw/airborne/arm7/gpio.c b/sw/airborne/arch/lpc21/gpio.c similarity index 100% rename from sw/airborne/arm7/gpio.c rename to sw/airborne/arch/lpc21/gpio.c diff --git a/sw/airborne/arm7/gpio.h b/sw/airborne/arch/lpc21/gpio.h similarity index 100% rename from sw/airborne/arm7/gpio.h rename to sw/airborne/arch/lpc21/gpio.h diff --git a/sw/airborne/arm7/gps_hw.h b/sw/airborne/arch/lpc21/gps_hw.h similarity index 100% rename from sw/airborne/arm7/gps_hw.h rename to sw/airborne/arch/lpc21/gps_hw.h diff --git a/sw/airborne/arm7/i2c_hw.c b/sw/airborne/arch/lpc21/i2c_hw.c similarity index 100% rename from sw/airborne/arm7/i2c_hw.c rename to sw/airborne/arch/lpc21/i2c_hw.c diff --git a/sw/airborne/arm7/i2c_hw.h b/sw/airborne/arch/lpc21/i2c_hw.h similarity index 100% rename from sw/airborne/arm7/i2c_hw.h rename to sw/airborne/arch/lpc21/i2c_hw.h diff --git a/sw/airborne/arm7/icp_scale.h b/sw/airborne/arch/lpc21/icp_scale.h similarity index 100% rename from sw/airborne/arm7/icp_scale.h rename to sw/airborne/arch/lpc21/icp_scale.h diff --git a/sw/airborne/arm7/include/LPC21xx.h b/sw/airborne/arch/lpc21/include/LPC21xx.h similarity index 100% rename from sw/airborne/arm7/include/LPC21xx.h rename to sw/airborne/arch/lpc21/include/LPC21xx.h diff --git a/sw/airborne/arm7/include/lpcADC.h b/sw/airborne/arch/lpc21/include/lpcADC.h similarity index 100% rename from sw/airborne/arm7/include/lpcADC.h rename to sw/airborne/arch/lpc21/include/lpcADC.h diff --git a/sw/airborne/arm7/include/lpcCAN.h b/sw/airborne/arch/lpc21/include/lpcCAN.h similarity index 100% rename from sw/airborne/arm7/include/lpcCAN.h rename to sw/airborne/arch/lpc21/include/lpcCAN.h diff --git a/sw/airborne/arm7/include/lpcEMC.h b/sw/airborne/arch/lpc21/include/lpcEMC.h similarity index 100% rename from sw/airborne/arm7/include/lpcEMC.h rename to sw/airborne/arch/lpc21/include/lpcEMC.h diff --git a/sw/airborne/arm7/include/lpcGPIO.h b/sw/airborne/arch/lpc21/include/lpcGPIO.h similarity index 100% rename from sw/airborne/arm7/include/lpcGPIO.h rename to sw/airborne/arch/lpc21/include/lpcGPIO.h diff --git a/sw/airborne/arm7/include/lpcI2C.h b/sw/airborne/arch/lpc21/include/lpcI2C.h similarity index 100% rename from sw/airborne/arm7/include/lpcI2C.h rename to sw/airborne/arch/lpc21/include/lpcI2C.h diff --git a/sw/airborne/arm7/include/lpcPIN.h b/sw/airborne/arch/lpc21/include/lpcPIN.h similarity index 100% rename from sw/airborne/arm7/include/lpcPIN.h rename to sw/airborne/arch/lpc21/include/lpcPIN.h diff --git a/sw/airborne/arm7/include/lpcRTC.h b/sw/airborne/arch/lpc21/include/lpcRTC.h similarity index 100% rename from sw/airborne/arm7/include/lpcRTC.h rename to sw/airborne/arch/lpc21/include/lpcRTC.h diff --git a/sw/airborne/arm7/include/lpcSCB.h b/sw/airborne/arch/lpc21/include/lpcSCB.h similarity index 100% rename from sw/airborne/arm7/include/lpcSCB.h rename to sw/airborne/arch/lpc21/include/lpcSCB.h diff --git a/sw/airborne/arm7/include/lpcSPI.h b/sw/airborne/arch/lpc21/include/lpcSPI.h similarity index 100% rename from sw/airborne/arm7/include/lpcSPI.h rename to sw/airborne/arch/lpc21/include/lpcSPI.h diff --git a/sw/airborne/arm7/include/lpcTMR.h b/sw/airborne/arch/lpc21/include/lpcTMR.h similarity index 100% rename from sw/airborne/arm7/include/lpcTMR.h rename to sw/airborne/arch/lpc21/include/lpcTMR.h diff --git a/sw/airborne/arm7/include/lpcUART.h b/sw/airborne/arch/lpc21/include/lpcUART.h similarity index 100% rename from sw/airborne/arm7/include/lpcUART.h rename to sw/airborne/arch/lpc21/include/lpcUART.h diff --git a/sw/airborne/arm7/include/lpcVIC.h b/sw/airborne/arch/lpc21/include/lpcVIC.h similarity index 100% rename from sw/airborne/arm7/include/lpcVIC.h rename to sw/airborne/arch/lpc21/include/lpcVIC.h diff --git a/sw/airborne/arm7/include/lpcWD.h b/sw/airborne/arch/lpc21/include/lpcWD.h similarity index 100% rename from sw/airborne/arm7/include/lpcWD.h rename to sw/airborne/arch/lpc21/include/lpcWD.h diff --git a/sw/airborne/arm7/include/types.h b/sw/airborne/arch/lpc21/include/types.h similarity index 100% rename from sw/airborne/arm7/include/types.h rename to sw/airborne/arch/lpc21/include/types.h diff --git a/sw/airborne/arm7/init_hw.h b/sw/airborne/arch/lpc21/init_hw.h similarity index 100% rename from sw/airborne/arm7/init_hw.h rename to sw/airborne/arch/lpc21/init_hw.h diff --git a/sw/airborne/arm7/interrupt_hw.h b/sw/airborne/arch/lpc21/interrupt_hw.h similarity index 100% rename from sw/airborne/arm7/interrupt_hw.h rename to sw/airborne/arch/lpc21/interrupt_hw.h diff --git a/sw/airborne/arm7/inttypes.h b/sw/airborne/arch/lpc21/inttypes.h similarity index 100% rename from sw/airborne/arm7/inttypes.h rename to sw/airborne/arch/lpc21/inttypes.h diff --git a/sw/airborne/arm7/led_hw.h b/sw/airborne/arch/lpc21/led_hw.h similarity index 100% rename from sw/airborne/arm7/led_hw.h rename to sw/airborne/arch/lpc21/led_hw.h diff --git a/sw/airborne/arm7/link_mcu_hw.h b/sw/airborne/arch/lpc21/link_mcu_hw.h similarity index 100% rename from sw/airborne/arm7/link_mcu_hw.h rename to sw/airborne/arch/lpc21/link_mcu_hw.h diff --git a/sw/airborne/arm7/lpcusb/CHANGELOG b/sw/airborne/arch/lpc21/lpcusb/CHANGELOG similarity index 100% rename from sw/airborne/arm7/lpcusb/CHANGELOG rename to sw/airborne/arch/lpc21/lpcusb/CHANGELOG diff --git a/sw/airborne/arm7/lpcusb/Doxyfile b/sw/airborne/arch/lpc21/lpcusb/Doxyfile similarity index 100% rename from sw/airborne/arm7/lpcusb/Doxyfile rename to sw/airborne/arch/lpc21/lpcusb/Doxyfile diff --git a/sw/airborne/arm7/lpcusb/Makefile b/sw/airborne/arch/lpc21/lpcusb/Makefile similarity index 100% rename from sw/airborne/arm7/lpcusb/Makefile rename to sw/airborne/arch/lpc21/lpcusb/Makefile diff --git a/sw/airborne/arm7/lpcusb/examples/Makefile b/sw/airborne/arch/lpc21/lpcusb/examples/Makefile similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/Makefile rename to sw/airborne/arch/lpc21/lpcusb/examples/Makefile diff --git a/sw/airborne/arm7/lpcusb/examples/armVIC.c b/sw/airborne/arch/lpc21/lpcusb/examples/armVIC.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/armVIC.c rename to sw/airborne/arch/lpc21/lpcusb/examples/armVIC.c diff --git a/sw/airborne/arm7/lpcusb/examples/armVIC.h b/sw/airborne/arch/lpc21/lpcusb/examples/armVIC.h similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/armVIC.h rename to sw/airborne/arch/lpc21/lpcusb/examples/armVIC.h diff --git a/sw/airborne/arm7/lpcusb/examples/blockdev.h b/sw/airborne/arch/lpc21/lpcusb/examples/blockdev.h similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/blockdev.h rename to sw/airborne/arch/lpc21/lpcusb/examples/blockdev.h diff --git a/sw/airborne/arm7/lpcusb/examples/blockdev_sd.c b/sw/airborne/arch/lpc21/lpcusb/examples/blockdev_sd.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/blockdev_sd.c rename to sw/airborne/arch/lpc21/lpcusb/examples/blockdev_sd.c diff --git a/sw/airborne/arm7/lpcusb/examples/console.c b/sw/airborne/arch/lpc21/lpcusb/examples/console.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/console.c rename to sw/airborne/arch/lpc21/lpcusb/examples/console.c diff --git a/sw/airborne/arm7/lpcusb/examples/console.h b/sw/airborne/arch/lpc21/lpcusb/examples/console.h similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/console.h rename to sw/airborne/arch/lpc21/lpcusb/examples/console.h diff --git a/sw/airborne/arm7/lpcusb/examples/crt.s b/sw/airborne/arch/lpc21/lpcusb/examples/crt.s similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/crt.s rename to sw/airborne/arch/lpc21/lpcusb/examples/crt.s diff --git a/sw/airborne/arm7/lpcusb/examples/lpc2000_spi.c b/sw/airborne/arch/lpc21/lpcusb/examples/lpc2000_spi.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/lpc2000_spi.c rename to sw/airborne/arch/lpc21/lpcusb/examples/lpc2000_spi.c diff --git a/sw/airborne/arm7/lpcusb/examples/lpc2000_spi0.c b/sw/airborne/arch/lpc21/lpcusb/examples/lpc2000_spi0.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/lpc2000_spi0.c rename to sw/airborne/arch/lpc21/lpcusb/examples/lpc2000_spi0.c diff --git a/sw/airborne/arm7/lpcusb/examples/lpc2148-ram.ld b/sw/airborne/arch/lpc21/lpcusb/examples/lpc2148-ram.ld similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/lpc2148-ram.ld rename to sw/airborne/arch/lpc21/lpcusb/examples/lpc2148-ram.ld diff --git a/sw/airborne/arm7/lpcusb/examples/lpc2148-rom-hi.ld b/sw/airborne/arch/lpc21/lpcusb/examples/lpc2148-rom-hi.ld similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/lpc2148-rom-hi.ld rename to sw/airborne/arch/lpc21/lpcusb/examples/lpc2148-rom-hi.ld diff --git a/sw/airborne/arm7/lpcusb/examples/lpc2148-rom.ld b/sw/airborne/arch/lpc21/lpcusb/examples/lpc2148-rom.ld similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/lpc2148-rom.ld rename to sw/airborne/arch/lpc21/lpcusb/examples/lpc2148-rom.ld diff --git a/sw/airborne/arm7/lpcusb/examples/main_msc.c b/sw/airborne/arch/lpc21/lpcusb/examples/main_msc.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/main_msc.c rename to sw/airborne/arch/lpc21/lpcusb/examples/main_msc.c diff --git a/sw/airborne/arm7/lpcusb/examples/msc_bot.c b/sw/airborne/arch/lpc21/lpcusb/examples/msc_bot.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/msc_bot.c rename to sw/airborne/arch/lpc21/lpcusb/examples/msc_bot.c diff --git a/sw/airborne/arm7/lpcusb/examples/msc_bot.h b/sw/airborne/arch/lpc21/lpcusb/examples/msc_bot.h similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/msc_bot.h rename to sw/airborne/arch/lpc21/lpcusb/examples/msc_bot.h diff --git a/sw/airborne/arm7/lpcusb/examples/msc_scsi.c b/sw/airborne/arch/lpc21/lpcusb/examples/msc_scsi.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/msc_scsi.c rename to sw/airborne/arch/lpc21/lpcusb/examples/msc_scsi.c diff --git a/sw/airborne/arm7/lpcusb/examples/msc_scsi.h b/sw/airborne/arch/lpc21/lpcusb/examples/msc_scsi.h similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/msc_scsi.h rename to sw/airborne/arch/lpc21/lpcusb/examples/msc_scsi.h diff --git a/sw/airborne/arm7/lpcusb/examples/printf.c b/sw/airborne/arch/lpc21/lpcusb/examples/printf.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/printf.c rename to sw/airborne/arch/lpc21/lpcusb/examples/printf.c diff --git a/sw/airborne/arm7/lpcusb/examples/spi.h b/sw/airborne/arch/lpc21/lpcusb/examples/spi.h similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/spi.h rename to sw/airborne/arch/lpc21/lpcusb/examples/spi.h diff --git a/sw/airborne/arm7/lpcusb/examples/startup.c b/sw/airborne/arch/lpc21/lpcusb/examples/startup.c similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/startup.c rename to sw/airborne/arch/lpc21/lpcusb/examples/startup.c diff --git a/sw/airborne/arm7/lpcusb/examples/startup.h b/sw/airborne/arch/lpc21/lpcusb/examples/startup.h similarity index 100% rename from sw/airborne/arm7/lpcusb/examples/startup.h rename to sw/airborne/arch/lpc21/lpcusb/examples/startup.h diff --git a/sw/airborne/arm7/lpcusb/type.h b/sw/airborne/arch/lpc21/lpcusb/type.h similarity index 100% rename from sw/airborne/arm7/lpcusb/type.h rename to sw/airborne/arch/lpc21/lpcusb/type.h diff --git a/sw/airborne/arm7/lpcusb/usbapi.h b/sw/airborne/arch/lpc21/lpcusb/usbapi.h similarity index 100% rename from sw/airborne/arm7/lpcusb/usbapi.h rename to sw/airborne/arch/lpc21/lpcusb/usbapi.h diff --git a/sw/airborne/arm7/lpcusb/usbcontrol.c b/sw/airborne/arch/lpc21/lpcusb/usbcontrol.c similarity index 100% rename from sw/airborne/arm7/lpcusb/usbcontrol.c rename to sw/airborne/arch/lpc21/lpcusb/usbcontrol.c diff --git a/sw/airborne/arm7/lpcusb/usbdebug.h b/sw/airborne/arch/lpc21/lpcusb/usbdebug.h similarity index 100% rename from sw/airborne/arm7/lpcusb/usbdebug.h rename to sw/airborne/arch/lpc21/lpcusb/usbdebug.h diff --git a/sw/airborne/arm7/lpcusb/usbhw_lpc.c b/sw/airborne/arch/lpc21/lpcusb/usbhw_lpc.c similarity index 100% rename from sw/airborne/arm7/lpcusb/usbhw_lpc.c rename to sw/airborne/arch/lpc21/lpcusb/usbhw_lpc.c diff --git a/sw/airborne/arm7/lpcusb/usbhw_lpc.h b/sw/airborne/arch/lpc21/lpcusb/usbhw_lpc.h similarity index 100% rename from sw/airborne/arm7/lpcusb/usbhw_lpc.h rename to sw/airborne/arch/lpc21/lpcusb/usbhw_lpc.h diff --git a/sw/airborne/arm7/lpcusb/usbinit.c b/sw/airborne/arch/lpc21/lpcusb/usbinit.c similarity index 100% rename from sw/airborne/arm7/lpcusb/usbinit.c rename to sw/airborne/arch/lpc21/lpcusb/usbinit.c diff --git a/sw/airborne/arm7/lpcusb/usbstdreq.c b/sw/airborne/arch/lpc21/lpcusb/usbstdreq.c similarity index 100% rename from sw/airborne/arm7/lpcusb/usbstdreq.c rename to sw/airborne/arch/lpc21/lpcusb/usbstdreq.c diff --git a/sw/airborne/arm7/lpcusb/usbstruct.h b/sw/airborne/arch/lpc21/lpcusb/usbstruct.h similarity index 100% rename from sw/airborne/arm7/lpcusb/usbstruct.h rename to sw/airborne/arch/lpc21/lpcusb/usbstruct.h diff --git a/sw/airborne/arm7/max11040_hw.c b/sw/airborne/arch/lpc21/max11040_hw.c similarity index 100% rename from sw/airborne/arm7/max11040_hw.c rename to sw/airborne/arch/lpc21/max11040_hw.c diff --git a/sw/airborne/arm7/max11040_hw.h b/sw/airborne/arch/lpc21/max11040_hw.h similarity index 100% rename from sw/airborne/arm7/max11040_hw.h rename to sw/airborne/arch/lpc21/max11040_hw.h diff --git a/sw/airborne/arm7/max1167_hw.c b/sw/airborne/arch/lpc21/max1167_hw.c similarity index 100% rename from sw/airborne/arm7/max1167_hw.c rename to sw/airborne/arch/lpc21/max1167_hw.c diff --git a/sw/airborne/arm7/max1167_hw.h b/sw/airborne/arch/lpc21/max1167_hw.h similarity index 100% rename from sw/airborne/arm7/max1167_hw.h rename to sw/airborne/arch/lpc21/max1167_hw.h diff --git a/sw/airborne/arm7/micromag_fw_hw.c b/sw/airborne/arch/lpc21/micromag_fw_hw.c similarity index 100% rename from sw/airborne/arm7/micromag_fw_hw.c rename to sw/airborne/arch/lpc21/micromag_fw_hw.c diff --git a/sw/airborne/arm7/micromag_fw_hw.h b/sw/airborne/arch/lpc21/micromag_fw_hw.h similarity index 100% rename from sw/airborne/arm7/micromag_fw_hw.h rename to sw/airborne/arch/lpc21/micromag_fw_hw.h diff --git a/sw/airborne/arm7/micromag_hw.c b/sw/airborne/arch/lpc21/micromag_hw.c similarity index 100% rename from sw/airborne/arm7/micromag_hw.c rename to sw/airborne/arch/lpc21/micromag_hw.c diff --git a/sw/airborne/arm7/micromag_hw.h b/sw/airborne/arch/lpc21/micromag_hw.h similarity index 100% rename from sw/airborne/arm7/micromag_hw.h rename to sw/airborne/arch/lpc21/micromag_hw.h diff --git a/sw/airborne/arm7/modem_hw.c b/sw/airborne/arch/lpc21/modem_hw.c similarity index 100% rename from sw/airborne/arm7/modem_hw.c rename to sw/airborne/arch/lpc21/modem_hw.c diff --git a/sw/airborne/arm7/modem_hw.h b/sw/airborne/arch/lpc21/modem_hw.h similarity index 100% rename from sw/airborne/arm7/modem_hw.h rename to sw/airborne/arch/lpc21/modem_hw.h diff --git a/sw/airborne/arm7/ppm_hw.c b/sw/airborne/arch/lpc21/ppm_hw.c similarity index 100% rename from sw/airborne/arm7/ppm_hw.c rename to sw/airborne/arch/lpc21/ppm_hw.c diff --git a/sw/airborne/arm7/ppm_hw.h b/sw/airborne/arch/lpc21/ppm_hw.h similarity index 100% rename from sw/airborne/arm7/ppm_hw.h rename to sw/airborne/arch/lpc21/ppm_hw.h diff --git a/sw/airborne/arm7/pwm_input.c b/sw/airborne/arch/lpc21/pwm_input.c similarity index 100% rename from sw/airborne/arm7/pwm_input.c rename to sw/airborne/arch/lpc21/pwm_input.c diff --git a/sw/airborne/arm7/pwm_input.h b/sw/airborne/arch/lpc21/pwm_input.h similarity index 100% rename from sw/airborne/arm7/pwm_input.h rename to sw/airborne/arch/lpc21/pwm_input.h diff --git a/sw/airborne/arm7/scp1000_hw.c b/sw/airborne/arch/lpc21/scp1000_hw.c similarity index 100% rename from sw/airborne/arm7/scp1000_hw.c rename to sw/airborne/arch/lpc21/scp1000_hw.c diff --git a/sw/airborne/arm7/scp1000_hw.h b/sw/airborne/arch/lpc21/scp1000_hw.h similarity index 100% rename from sw/airborne/arm7/scp1000_hw.h rename to sw/airborne/arch/lpc21/scp1000_hw.h diff --git a/sw/airborne/arm7/servos_4015_MAT_hw.c b/sw/airborne/arch/lpc21/servos_4015_MAT_hw.c similarity index 100% rename from sw/airborne/arm7/servos_4015_MAT_hw.c rename to sw/airborne/arch/lpc21/servos_4015_MAT_hw.c diff --git a/sw/airborne/arm7/servos_4015_MAT_hw.h b/sw/airborne/arch/lpc21/servos_4015_MAT_hw.h similarity index 100% rename from sw/airborne/arm7/servos_4015_MAT_hw.h rename to sw/airborne/arch/lpc21/servos_4015_MAT_hw.h diff --git a/sw/airborne/arm7/servos_4015_hw.c b/sw/airborne/arch/lpc21/servos_4015_hw.c similarity index 100% rename from sw/airborne/arm7/servos_4015_hw.c rename to sw/airborne/arch/lpc21/servos_4015_hw.c diff --git a/sw/airborne/arm7/servos_4015_hw.h b/sw/airborne/arch/lpc21/servos_4015_hw.h similarity index 100% rename from sw/airborne/arm7/servos_4015_hw.h rename to sw/airborne/arch/lpc21/servos_4015_hw.h diff --git a/sw/airborne/arm7/servos_4015_hw_new.c b/sw/airborne/arch/lpc21/servos_4015_hw_new.c similarity index 100% rename from sw/airborne/arm7/servos_4015_hw_new.c rename to sw/airborne/arch/lpc21/servos_4015_hw_new.c diff --git a/sw/airborne/arm7/servos_4017_hw.c b/sw/airborne/arch/lpc21/servos_4017_hw.c similarity index 100% rename from sw/airborne/arm7/servos_4017_hw.c rename to sw/airborne/arch/lpc21/servos_4017_hw.c diff --git a/sw/airborne/arm7/servos_4017_hw.h b/sw/airborne/arch/lpc21/servos_4017_hw.h similarity index 100% rename from sw/airborne/arm7/servos_4017_hw.h rename to sw/airborne/arch/lpc21/servos_4017_hw.h diff --git a/sw/airborne/arm7/servos_csc.c b/sw/airborne/arch/lpc21/servos_csc.c similarity index 100% rename from sw/airborne/arm7/servos_csc.c rename to sw/airborne/arch/lpc21/servos_csc.c diff --git a/sw/airborne/arm7/servos_csc.h b/sw/airborne/arch/lpc21/servos_csc.h similarity index 100% rename from sw/airborne/arm7/servos_csc.h rename to sw/airborne/arch/lpc21/servos_csc.h diff --git a/sw/airborne/arm7/servos_direct_hw.c b/sw/airborne/arch/lpc21/servos_direct_hw.c similarity index 100% rename from sw/airborne/arm7/servos_direct_hw.c rename to sw/airborne/arch/lpc21/servos_direct_hw.c diff --git a/sw/airborne/arm7/servos_direct_hw.h b/sw/airborne/arch/lpc21/servos_direct_hw.h similarity index 100% rename from sw/airborne/arm7/servos_direct_hw.h rename to sw/airborne/arch/lpc21/servos_direct_hw.h diff --git a/sw/airborne/arm7/servos_ppm_hw.c b/sw/airborne/arch/lpc21/servos_ppm_hw.c similarity index 100% rename from sw/airborne/arm7/servos_ppm_hw.c rename to sw/airborne/arch/lpc21/servos_ppm_hw.c diff --git a/sw/airborne/arm7/servos_ppm_hw.h b/sw/airborne/arch/lpc21/servos_ppm_hw.h similarity index 100% rename from sw/airborne/arm7/servos_ppm_hw.h rename to sw/airborne/arch/lpc21/servos_ppm_hw.h diff --git a/sw/airborne/arm7/spi_hw.c b/sw/airborne/arch/lpc21/spi_hw.c similarity index 100% rename from sw/airborne/arm7/spi_hw.c rename to sw/airborne/arch/lpc21/spi_hw.c diff --git a/sw/airborne/arm7/spi_hw.h b/sw/airborne/arch/lpc21/spi_hw.h similarity index 100% rename from sw/airborne/arm7/spi_hw.h rename to sw/airborne/arch/lpc21/spi_hw.h diff --git a/sw/airborne/arm7/ssp_hw.h b/sw/airborne/arch/lpc21/ssp_hw.h similarity index 100% rename from sw/airborne/arm7/ssp_hw.h rename to sw/airborne/arch/lpc21/ssp_hw.h diff --git a/sw/airborne/arm7/sys_time_hw.c b/sw/airborne/arch/lpc21/sys_time_hw.c similarity index 100% rename from sw/airborne/arm7/sys_time_hw.c rename to sw/airborne/arch/lpc21/sys_time_hw.c diff --git a/sw/airborne/arm7/sys_time_hw.h b/sw/airborne/arch/lpc21/sys_time_hw.h similarity index 100% rename from sw/airborne/arm7/sys_time_hw.h rename to sw/airborne/arch/lpc21/sys_time_hw.h diff --git a/sw/airborne/arm7/tacho_mb.c b/sw/airborne/arch/lpc21/tacho_mb.c similarity index 100% rename from sw/airborne/arm7/tacho_mb.c rename to sw/airborne/arch/lpc21/tacho_mb.c diff --git a/sw/airborne/arm7/tacho_mb.h b/sw/airborne/arch/lpc21/tacho_mb.h similarity index 100% rename from sw/airborne/arm7/tacho_mb.h rename to sw/airborne/arch/lpc21/tacho_mb.h diff --git a/sw/airborne/arm7/test/LPC2138-ROM-bl.ld b/sw/airborne/arch/lpc21/test/LPC2138-ROM-bl.ld similarity index 100% rename from sw/airborne/arm7/test/LPC2138-ROM-bl.ld rename to sw/airborne/arch/lpc21/test/LPC2138-ROM-bl.ld diff --git a/sw/airborne/arm7/test/LPC2138-ROM.ld b/sw/airborne/arch/lpc21/test/LPC2138-ROM.ld similarity index 100% rename from sw/airborne/arm7/test/LPC2138-ROM.ld rename to sw/airborne/arch/lpc21/test/LPC2138-ROM.ld diff --git a/sw/airborne/arm7/test/Makefile b/sw/airborne/arch/lpc21/test/Makefile similarity index 100% rename from sw/airborne/arm7/test/Makefile rename to sw/airborne/arch/lpc21/test/Makefile diff --git a/sw/airborne/arm7/test/bootloader/Makefile b/sw/airborne/arch/lpc21/test/bootloader/Makefile similarity index 100% rename from sw/airborne/arm7/test/bootloader/Makefile rename to sw/airborne/arch/lpc21/test/bootloader/Makefile diff --git a/sw/airborne/arm7/test/bootloader/bootloader.c b/sw/airborne/arch/lpc21/test/bootloader/bootloader.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/bootloader.c rename to sw/airborne/arch/lpc21/test/bootloader/bootloader.c diff --git a/sw/airborne/arm7/test/bootloader/console.c b/sw/airborne/arch/lpc21/test/bootloader/console.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/console.c rename to sw/airborne/arch/lpc21/test/bootloader/console.c diff --git a/sw/airborne/arm7/test/bootloader/console.h b/sw/airborne/arch/lpc21/test/bootloader/console.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/console.h rename to sw/airborne/arch/lpc21/test/bootloader/console.h diff --git a/sw/airborne/arm7/test/bootloader/crt.S b/sw/airborne/arch/lpc21/test/bootloader/crt.S similarity index 100% rename from sw/airborne/arm7/test/bootloader/crt.S rename to sw/airborne/arch/lpc21/test/bootloader/crt.S diff --git a/sw/airborne/arm7/test/bootloader/flash.sh b/sw/airborne/arch/lpc21/test/bootloader/flash.sh similarity index 100% rename from sw/airborne/arm7/test/bootloader/flash.sh rename to sw/airborne/arch/lpc21/test/bootloader/flash.sh diff --git a/sw/airborne/arm7/test/bootloader/lpc2148-ram.ld b/sw/airborne/arch/lpc21/test/bootloader/lpc2148-ram.ld similarity index 100% rename from sw/airborne/arm7/test/bootloader/lpc2148-ram.ld rename to sw/airborne/arch/lpc21/test/bootloader/lpc2148-ram.ld diff --git a/sw/airborne/arm7/test/bootloader/lpc2148-rom-hi.ld b/sw/airborne/arch/lpc21/test/bootloader/lpc2148-rom-hi.ld similarity index 100% rename from sw/airborne/arm7/test/bootloader/lpc2148-rom-hi.ld rename to sw/airborne/arch/lpc21/test/bootloader/lpc2148-rom-hi.ld diff --git a/sw/airborne/arm7/test/bootloader/lpc2148-rom.ld b/sw/airborne/arch/lpc21/test/bootloader/lpc2148-rom.ld similarity index 100% rename from sw/airborne/arm7/test/bootloader/lpc2148-rom.ld rename to sw/airborne/arch/lpc21/test/bootloader/lpc2148-rom.ld diff --git a/sw/airborne/arm7/test/bootloader/lpc21iap.h b/sw/airborne/arch/lpc21/test/bootloader/lpc21iap.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/lpc21iap.h rename to sw/airborne/arch/lpc21/test/bootloader/lpc21iap.h diff --git a/sw/airborne/arm7/test/bootloader/printf.c b/sw/airborne/arch/lpc21/test/bootloader/printf.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/printf.c rename to sw/airborne/arch/lpc21/test/bootloader/printf.c diff --git a/sw/airborne/arm7/test/bootloader/startup.c b/sw/airborne/arch/lpc21/test/bootloader/startup.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/startup.c rename to sw/airborne/arch/lpc21/test/bootloader/startup.c diff --git a/sw/airborne/arm7/test/bootloader/startup.h b/sw/airborne/arch/lpc21/test/bootloader/startup.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/startup.h rename to sw/airborne/arch/lpc21/test/bootloader/startup.h diff --git a/sw/airborne/arm7/test/bootloader/type.h b/sw/airborne/arch/lpc21/test/bootloader/type.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/type.h rename to sw/airborne/arch/lpc21/test/bootloader/type.h diff --git a/sw/airborne/arm7/test/bootloader/usbapi.h b/sw/airborne/arch/lpc21/test/bootloader/usbapi.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbapi.h rename to sw/airborne/arch/lpc21/test/bootloader/usbapi.h diff --git a/sw/airborne/arm7/test/bootloader/usbcontrol.c b/sw/airborne/arch/lpc21/test/bootloader/usbcontrol.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbcontrol.c rename to sw/airborne/arch/lpc21/test/bootloader/usbcontrol.c diff --git a/sw/airborne/arm7/test/bootloader/usbdebug.h b/sw/airborne/arch/lpc21/test/bootloader/usbdebug.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbdebug.h rename to sw/airborne/arch/lpc21/test/bootloader/usbdebug.h diff --git a/sw/airborne/arm7/test/bootloader/usbdescrip.c b/sw/airborne/arch/lpc21/test/bootloader/usbdescrip.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbdescrip.c rename to sw/airborne/arch/lpc21/test/bootloader/usbdescrip.c diff --git a/sw/airborne/arm7/test/bootloader/usbhw_lpc.c b/sw/airborne/arch/lpc21/test/bootloader/usbhw_lpc.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbhw_lpc.c rename to sw/airborne/arch/lpc21/test/bootloader/usbhw_lpc.c diff --git a/sw/airborne/arm7/test/bootloader/usbhw_lpc.h b/sw/airborne/arch/lpc21/test/bootloader/usbhw_lpc.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbhw_lpc.h rename to sw/airborne/arch/lpc21/test/bootloader/usbhw_lpc.h diff --git a/sw/airborne/arm7/test/bootloader/usbinit.c b/sw/airborne/arch/lpc21/test/bootloader/usbinit.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbinit.c rename to sw/airborne/arch/lpc21/test/bootloader/usbinit.c diff --git a/sw/airborne/arm7/test/bootloader/usbstdreq.c b/sw/airborne/arch/lpc21/test/bootloader/usbstdreq.c similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbstdreq.c rename to sw/airborne/arch/lpc21/test/bootloader/usbstdreq.c diff --git a/sw/airborne/arm7/test/bootloader/usbstruct.h b/sw/airborne/arch/lpc21/test/bootloader/usbstruct.h similarity index 100% rename from sw/airborne/arm7/test/bootloader/usbstruct.h rename to sw/airborne/arch/lpc21/test/bootloader/usbstruct.h diff --git a/sw/airborne/arm7/test/crt0.S b/sw/airborne/arch/lpc21/test/crt0.S similarity index 100% rename from sw/airborne/arm7/test/crt0.S rename to sw/airborne/arch/lpc21/test/crt0.S diff --git a/sw/airborne/arm7/test/dev_board.h b/sw/airborne/arch/lpc21/test/dev_board.h similarity index 100% rename from sw/airborne/arm7/test/dev_board.h rename to sw/airborne/arch/lpc21/test/dev_board.h diff --git a/sw/airborne/arm7/test/inttypes.h b/sw/airborne/arch/lpc21/test/inttypes.h similarity index 100% rename from sw/airborne/arm7/test/inttypes.h rename to sw/airborne/arch/lpc21/test/inttypes.h diff --git a/sw/airborne/arm7/test/ledswitch.c b/sw/airborne/arch/lpc21/test/ledswitch.c similarity index 100% rename from sw/airborne/arm7/test/ledswitch.c rename to sw/airborne/arch/lpc21/test/ledswitch.c diff --git a/sw/airborne/arm7/test/lpc2138.h b/sw/airborne/arch/lpc21/test/lpc2138.h similarity index 100% rename from sw/airborne/arm7/test/lpc2138.h rename to sw/airborne/arch/lpc21/test/lpc2138.h diff --git a/sw/airborne/arm7/test/lpc21xx.h b/sw/airborne/arch/lpc21/test/lpc21xx.h similarity index 100% rename from sw/airborne/arm7/test/lpc21xx.h rename to sw/airborne/arch/lpc21/test/lpc21xx.h diff --git a/sw/airborne/arm7/test/timer.c b/sw/airborne/arch/lpc21/test/timer.c similarity index 100% rename from sw/airborne/arm7/test/timer.c rename to sw/airborne/arch/lpc21/test/timer.c diff --git a/sw/airborne/arm7/test/uart.c b/sw/airborne/arch/lpc21/test/uart.c similarity index 100% rename from sw/airborne/arm7/test/uart.c rename to sw/airborne/arch/lpc21/test/uart.c diff --git a/sw/airborne/arm7/test/uart_tunnel.c b/sw/airborne/arch/lpc21/test/uart_tunnel.c similarity index 100% rename from sw/airborne/arm7/test/uart_tunnel.c rename to sw/airborne/arch/lpc21/test/uart_tunnel.c diff --git a/sw/airborne/arm7/test/welcome.h b/sw/airborne/arch/lpc21/test/welcome.h similarity index 100% rename from sw/airborne/arm7/test/welcome.h rename to sw/airborne/arch/lpc21/test/welcome.h diff --git a/sw/airborne/arm7/trig_ext_hw.c b/sw/airborne/arch/lpc21/trig_ext_hw.c similarity index 100% rename from sw/airborne/arm7/trig_ext_hw.c rename to sw/airborne/arch/lpc21/trig_ext_hw.c diff --git a/sw/airborne/arm7/trig_ext_hw.h b/sw/airborne/arch/lpc21/trig_ext_hw.h similarity index 100% rename from sw/airborne/arm7/trig_ext_hw.h rename to sw/airborne/arch/lpc21/trig_ext_hw.h diff --git a/sw/airborne/arm7/uart_hw.c b/sw/airborne/arch/lpc21/uart_hw.c similarity index 100% rename from sw/airborne/arm7/uart_hw.c rename to sw/airborne/arch/lpc21/uart_hw.c diff --git a/sw/airborne/arm7/uart_hw.h b/sw/airborne/arch/lpc21/uart_hw.h similarity index 100% rename from sw/airborne/arm7/uart_hw.h rename to sw/airborne/arch/lpc21/uart_hw.h diff --git a/sw/airborne/arm7/uart_tunnel.c b/sw/airborne/arch/lpc21/uart_tunnel.c similarity index 100% rename from sw/airborne/arm7/uart_tunnel.c rename to sw/airborne/arch/lpc21/uart_tunnel.c diff --git a/sw/airborne/arm7/usb_msc_hw.c b/sw/airborne/arch/lpc21/usb_msc_hw.c similarity index 100% rename from sw/airborne/arm7/usb_msc_hw.c rename to sw/airborne/arch/lpc21/usb_msc_hw.c diff --git a/sw/airborne/arm7/usb_msc_hw.h b/sw/airborne/arch/lpc21/usb_msc_hw.h similarity index 100% rename from sw/airborne/arm7/usb_msc_hw.h rename to sw/airborne/arch/lpc21/usb_msc_hw.h diff --git a/sw/airborne/arm7/usb_ser_hw.c b/sw/airborne/arch/lpc21/usb_ser_hw.c similarity index 100% rename from sw/airborne/arm7/usb_ser_hw.c rename to sw/airborne/arch/lpc21/usb_ser_hw.c diff --git a/sw/airborne/arm7/usb_tunnel.c b/sw/airborne/arch/lpc21/usb_tunnel.c similarity index 100% rename from sw/airborne/arm7/usb_tunnel.c rename to sw/airborne/arch/lpc21/usb_tunnel.c diff --git a/sw/airborne/arm7/vic_slots.txt b/sw/airborne/arch/lpc21/vic_slots.txt similarity index 100% rename from sw/airborne/arm7/vic_slots.txt rename to sw/airborne/arch/lpc21/vic_slots.txt