Name compiled firmware based on board, not MCU arch.

openxc · Jun 25, 2013 · ef036f2 · ef036f2
1 parent 312dac2
commit ef036f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -35,6 +35,9 @@ ifndef PLATFORM
 PLATFORM = CHIPKIT
 endif
 
+OBJDIR = build/$(PLATFORM)
+TARGET = $(BASE_TARGET)-$(PLATFORM)
+
 CROSSPLATFORM_C_SRCS = $(wildcard *.c)
 CROSSPLATFORM_C_SRCS += $(wildcard can/*.c)
 CROSSPLATFORM_C_SRCS += $(wildcard interface/*.c)

diff --git a/src/platform/lpc17xx/lpc17xx.mk b/src/platform/lpc17xx/lpc17xx.mk
@@ -8,9 +8,7 @@ ifndef JTAG_INTERFACE
 	JTAG_INTERFACE = olimex-arm-usb-ocd
 endif
 
-OBJDIR = build/lpc17xx
 OPENOCD_CONF_BASE = ../conf/openocd
-TARGET = $(BASE_TARGET)-lpc17xx
 LIBS_PATH = libs
 CMSIS_PATH = ./$(LIBS_PATH)/CDL/CMSISv2p00_LPC17xx
 DRIVER_PATH = ./$(LIBS_PATH)/CDL/LPC17xxLib

diff --git a/src/platform/pic32/pic32.mk b/src/platform/pic32/pic32.mk
@@ -1,5 +1,4 @@
 BOARD_TAG = mega_pic32
-TARGET = $(BASE_TARGET)-pic32
 
 ARDUINO_LIBS = chipKITUSBDevice chipKITUSBDevice/utility cJSON emqueue
 ifdef NETWORK
@@ -43,7 +42,6 @@ endif
 
 NO_CORE_MAIN_FUNCTION = 1
 SKIP_SUFFIX_CHECK = 1
-OBJDIR = build/pic32
 
 UART_BAUDRATE = 115200