diff options
Diffstat (limited to 'OpenCM.mk')
| -rw-r--r-- | OpenCM.mk | 97 |
1 files changed, 11 insertions, 86 deletions
@@ -44,17 +44,12 @@ ifndef BOARDS_TXT BOARDS_TXT = $(ARDUINO_DIR)/hardware/$(ARDMK_VENDOR)/boards.txt endif -ifndef PARSE_OPENCM - # result = $(call READ_BOARD_TXT, 'boardname', 'parameter') - PARSE_OPENCM = $(shell grep -v "^\#" "$(BOARDS_TXT)" | grep $(1).$(2) | cut -d = -f 2- ) -endif - ifndef F_CPU - F_CPU := $(call PARSE_OPENCM,$(BOARD_TAG),build.f_cpu) + F_CPU := $(call PARSE_BOARD,$(BOARD_TAG),build.f_cpu) endif # if boards.txt gets modified, look there, else hard code it -ARCHITECTURE = $(call PARSE_OPENCM,$(BOARD_TAG),build.architecture) +ARCHITECTURE = $(call PARSE_BOARD,$(BOARD_TAG),build.architecture) ifeq ($(strip $(ARCHITECTURE)),) ARCHITECTURE = arm endif @@ -74,81 +69,11 @@ endif ######################################################################## # command names -ifndef CC_NAME - CC_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.gcc) - ifndef CC_NAME - CC_NAME := arm-none-eabi-gcc - else - $(call show_config_variable,CC_NAME,[COMPUTED]) - endif -endif - -ifndef CXX_NAME - CXX_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.g++) - ifndef CXX_NAME - CXX_NAME := arm-none-eabi-g++ - else - $(call show_config_variable,CXX_NAME,[COMPUTED]) - endif -endif - -ifndef AS_NAME - AS_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.as) - ifndef AS_NAME - AS_NAME := arm-none-eabi-as - else - $(call show_config_variable,AS_NAME,[COMPUTED]) - endif -endif - -ifndef OBJDUMP_NAME - OBJDUMP_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.objdump) - ifndef OBJDUMP_NAME - OBJDUMP_NAME := arm-none-eabi-objdump - else - $(call show_config_variable,OBJDUMP_NAME,[COMPUTED]) - endif -endif - -ifndef AR_NAME - AR_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.ar) - ifndef AR_NAME - AR_NAME := arm-none-eabi-ar - else - $(call show_config_variable,AR_NAME,[COMPUTED]) - endif -endif - -ifndef SIZE_NAME - SIZE_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.size) - ifndef SIZE_NAME - SIZE_NAME := arm-none-eabi-size - else - $(call show_config_variable,SIZE_NAME,[COMPUTED]) - endif -endif - -ifndef NM_NAME - NM_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.nm) - ifndef NM_NAME - NM_NAME := arm-none-eabi-nm - else - $(call show_config_variable,NM_NAME,[COMPUTED]) - endif -endif - -ifndef OBJCOPY_NAME - OBJCOPY_NAME := $(call PARSE_OPENCM,$(BOARD_TAG),build.command.objcopy) - ifndef OBJCOPY_NAME - OBJCOPY_NAME := arm-none-eabi-objcopy - else - $(call show_config_variable,OBJCOPY_NAME,[COMPUTED]) - endif -endif +TOOL_PREFIX = arm-none-eabi # processor stuff ifndef MCU - MCU := $(call PARSE_OPENCM,$(BOARD_TAG),build.family) + MCU := $(call PARSE_BOARD,$(BOARD_TAG),build.family) endif ifndef MCU_FLAG_NAME @@ -161,20 +86,20 @@ ifndef USB_TYPE USB_TYPE = USB_SERIAL endif -CPPFLAGS += -DBOARD_$(call PARSE_OPENCM,$(BOARD_TAG),build.board) -CPPFLAGS += -DMCU_$(call PARSE_OPENCM,$(BOARD_TAG),build.mcu) +CPPFLAGS += -DBOARD_$(call PARSE_BOARD,$(BOARD_TAG),build.board) +CPPFLAGS += -DMCU_$(call PARSE_BOARD,$(BOARD_TAG),build.mcu) CPPFLAGS += -DSTM32_MEDIUM_DENSITY -DVECT_TAB_FLASH -CPPFLAGS += $(call PARSE_OPENCM,$(BOARD_TAG),build.option) +CPPFLAGS += $(call PARSE_BOARD,$(BOARD_TAG),build.option) CXXFLAGS += -fno-rtti -CXXFLAGS += $(call PARSE_OPENCM,$(BOARD_TAG),build.cppoption) -ifeq ("$(call PARSE_OPENCM,$(BOARD_TAG),build.gnu0x)","true") +CXXFLAGS += $(call PARSE_BOARD,$(BOARD_TAG),build.cppoption) +ifeq ("$(call PARSE_BOARD,$(BOARD_TAG),build.gnu0x)","true") CXXFLAGS_STD += -std=gnu++0x endif -ifeq ("$(call PARSE_OPENCM,$(BOARD_TAG),build.elide_constructors)", "true") +ifeq ("$(call PARSE_BOARD,$(BOARD_TAG),build.elide_constructors)", "true") CXXFLAGS += -felide-constructors endif @@ -209,7 +134,7 @@ ifeq ($(CURRENT_OS), WINDOWS) else override AVRDUDE_ARD_OPTS = $(call get_monitor_port) endif - + override AVRDUDE_UPLOAD_HEX = $(TARGET_HEX) ######################################################################## |