cleanup a little, remove ARCHI

This commit is contained in:
Felix Ruess
2010-09-22 23:59:57 +00:00
parent 049346b695
commit f36c6bccf3
42 changed files with 703 additions and 729 deletions
+2 -2
View File
@@ -8,8 +8,8 @@
<makefile>
ARCHI=avr
ant.ARCHDIR = $(ARCHI)
ARCH=avr
ant.ARCHDIR = $(ARCH)
ant.MCU = atmega128
+2 -3
View File
@@ -6,12 +6,11 @@
ARCH=lpc21
BOARD_CFG = \"boards/olimex_lpc_h2148.h\"
ARCHI=arm7
FLASH_MODE = IAP
include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile
test_usb.ARCHDIR = $(ARCHI)
test_usb.ARCHDIR = $(ARCH)
test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS)
test_usb.srcs += $(SRC_BOOZ_TEST)/atpt_main.c
@@ -40,4 +39,4 @@ test_usb.srcs += $(SRC_ARCH)/servos_direct_hw.c
</makefile>
</airframe>
</airframe>
-1
View File
@@ -89,7 +89,6 @@
#
ARCH=stm32
ARCHI=stm32
#BOARD_CFG = \"boards/lisa_l_1.0.h\"
FLASH_MODE = JTAG
+2 -2
View File
@@ -3,9 +3,9 @@
<makefile>
ARCHI=avr
ARCH=avr
main.ARCHDIR=$(ARCHI)
main.ARCHDIR=$(ARCH)
main.MCU = atmega128
# internal RC 8MHz
-1
View File
@@ -181,7 +181,6 @@
<makefile>
ARCH=lpc21
ARCHI=arm7
BOARD_CFG = \"boards/booz2_v1_0.h\"
# prevents motors from ever starting
+4 -4
View File
@@ -2,13 +2,13 @@
<makefile>
ARCHI=arm7
ARCH=lpc21
FLASH_MODE = IAP
MB=motor_bench
main.ARCHDIR = $(ARCHI)
main.ARCHDIR = $(ARCH)
main.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
main.srcs = $(MB)/main_motor_bench.c
@@ -52,7 +52,7 @@ main.srcs += $(MB)/mb_modes.c
#main.srcs += $(MB)/mb_static.c
#main.srcs += $(MB)/mb_mode_fixed_rpm.c
foo.ARCHDIR = $(ARCHI)
foo.ARCHDIR = $(ARCH)
foo.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
foo.srcs = $(MB)/main_foo.c
@@ -71,7 +71,7 @@ foo.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c
bar.ARCHDIR = $(ARCHI)
bar.ARCHDIR = $(ARCH)
bar.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
bar.srcs = $(MB)/main_bar.c
+3 -3
View File
@@ -8,17 +8,17 @@
<makefile>
tunnel.ARCHDIR = $(ARCHI)
tunnel.ARCHDIR = $(ARCH)
tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"conf_demo.h\" -DLED -DTIME_LED=1
tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
ARCHI=arm7
ARCH=lpc21
FLASH_MODE = IAP
PT_ANT = antenna
main.ARCHDIR = $(ARCHI)
main.ARCHDIR = $(ARCH)
main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(PT_ANT)
main.srcs = $(PT_ANT)/pt_ant_main.c
+1 -2
View File
@@ -2,13 +2,12 @@
<makefile>
ARCH=lpc21
ARCHI=arm7
FLASH_MODE = IAP
MB=motor_bench
main.ARCHDIR = $(ARCHI)
main.ARCHDIR = $(ARCH)
main.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" -I$(MB)
main.CFLAGS += -DPERIPHERALS_AUTO_INIT