xobs
/
simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up ASFLAGS

This commit is contained in:
hathach 2020-03-25 14:15:13 +07:00
parent b2d4b016a9
commit b91a76a16e
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -75,15 +75,15 @@ BUILD = _build/build-$(BOARD)
ifeq ($(MCU_SUB_VARIANT),nrf52) ifeq ($(MCU_SUB_VARIANT),nrf52)
SD_NAME = s132 SD_NAME = s132
DFU_DEV_REV = 0xADAF DFU_DEV_REV = 0xADAF
MCU_FLAGS = -DNRF52 -DNRF52832_XXAA -DS132 CFLAGS += -DNRF52 -DNRF52832_XXAA -DS132
else ifeq ($(MCU_SUB_VARIANT),nrf52833) else ifeq ($(MCU_SUB_VARIANT),nrf52833)
SD_NAME = s140 SD_NAME = s140
DFU_DEV_REV = 52840 DFU_DEV_REV = 52840
MCU_FLAGS = -DNRF52833_XXAA -DS140 CFLAGS += -DNRF52833_XXAA -DS140
else ifeq ($(MCU_SUB_VARIANT),nrf52840) else ifeq ($(MCU_SUB_VARIANT),nrf52840)
SD_NAME = s140 SD_NAME = s140
DFU_DEV_REV = 52840 DFU_DEV_REV = 52840
MCU_FLAGS = -DNRF52840_XXAA -DS140 CFLAGS += -DNRF52840_XXAA -DS140
else else
$(error Sub Variant $(MCU_SUB_VARIANT) is unknown) $(error Sub Variant $(MCU_SUB_VARIANT) is unknown)
endif endif
@ -244,7 +244,6 @@ CFLAGS += -DCONFIG_GPIO_AS_PINRESET
CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS CFLAGS += -DCONFIG_NFCT_PINS_AS_GPIOS
CFLAGS += -DSOFTDEVICE_PRESENT CFLAGS += -DSOFTDEVICE_PRESENT
CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096 CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096
CFLAGS += $(MCU_FLAGS)
CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"' CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS) $(SD_NAME) $(SD_VERSION)"'
CFLAGS += -DBLEDIS_FW_VERSION='"$(GIT_VERSION) $(SD_NAME) $(SD_VERSION)"' CFLAGS += -DBLEDIS_FW_VERSION='"$(GIT_VERSION) $(SD_NAME) $(SD_VERSION)"'
@ -270,10 +269,7 @@ LIBS += -lm -lc
# Assembler flags # Assembler flags
# #
#****************************************************************************** #******************************************************************************
ASMFLAGS += -x assembler-with-cpp ASFLAGS += $(CFLAGS)
ASMFLAGS += -D__HEAP_SIZE=0
ASMFLAGS += -DSOFTDEVICE_PRESENT
ASMFLAGS += $(MCU_FLAGS)
#function for removing duplicates in a list #function for removing duplicates in a list
@ -302,7 +298,7 @@ $(info CFLAGS $(CFLAGS))
$(info ) $(info )
$(info LDFLAGS $(LDFLAGS)) $(info LDFLAGS $(LDFLAGS))
$(info ) $(info )
$(info ASMFLAGS $(ASMFLAGS)) $(info ASFLAGS $(ASFLAGS))
$(info ) $(info )
endif endif
@ -367,7 +363,7 @@ $(BUILD)/%.o: %.c
# Assemble files # Assemble files
$(BUILD)/%.o: %.S $(BUILD)/%.o: %.S
@echo AS $(notdir $<) @echo AS $(notdir $<)
$(QUIET)$(CC) $(ASMFLAGS) $(INC_PATHS) -c -o $@ $< $(QUIET)$(CC) -x assembler-with-cpp $(ASFLAGS) $(INC_PATHS) -c -o $@ $<
# Link # Link
$(BUILD)/$(OUT_FILE)-nosd.out: $(BUILD) $(OBJECTS) $(BUILD)/$(OUT_FILE)-nosd.out: $(BUILD) $(OBJECTS)