smartwatch/narf52
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dev/irq #8

Merged
tkl merged 6 commits from dev/irq into master 2020-04-09 08:05:33 +00:00
Conversation 0 Commits 6 Files Changed 24 +13 -10
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 59ab17487f - Show all commits

7
Makefile
View File

@ -9,6 +9,7 @@ CC = $(CROSS_COMPILE)gcc
CPP = $(CROSS_COMPILE)cpp CPP = $(CROSS_COMPILE)cpp
CXX = $(CROSS_COMPILE)g++ CXX = $(CROSS_COMPILE)g++
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
SIZE = $(CROSS_COMPILE)size SIZE = $(CROSS_COMPILE)size
CHECK = cppcheck CHECK = cppcheck
@ -75,9 +76,11 @@ check: $(C_SRCS)
$(TARGET): $(OBJS) $(THIS_MAKEFILE) $(TARGET): $(OBJS) $(THIS_MAKEFILE)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(CXX) $(CXX_FLAGS) $(LD_FLAGS) $(OBJS) $(addprefix -l,$(LIBS)) -o $@ $(CXX) $(CXX_FLAGS) $(LD_FLAGS) $(OBJS) $(addprefix -l,$(LIBS)) -Wl,-Map=$@.map -o $@
$(OBJDUMP) --disassemble-all --section=.text --source -EL -C --wide --line-numbers --inlines $@ > $@.text.disassemble
ln -sf $(shell pwd)/$@ $(shell pwd)/bin/firmware.elf ln -sf $(shell pwd)/$@ $(shell pwd)/bin/firmware.elf
$(SIZE) -x $@ $(SIZE) -x $@ > $@.size
@cat $@.size
$(TARGET_HEX): $(TARGET) $(THIS_MAKEFILE) $(TARGET_HEX): $(TARGET) $(THIS_MAKEFILE)
$(OBJCOPY) -O ihex $(TARGET) $(TARGET_HEX) $(OBJCOPY) -O ihex $(TARGET) $(TARGET_HEX)

16
build_system/platform/nrf52/Makefile.nrf52
View File

@ -25,9 +25,9 @@ C_FLAGS += -DFLOAT_ABI_HARD
C_FLAGS += -DNRF52 C_FLAGS += -DNRF52
C_FLAGS += -DNRF52832_XXAA C_FLAGS += -DNRF52832_XXAA
C_FLAGS += -DNRF52_PAN_74 C_FLAGS += -DNRF52_PAN_74
C_FLAGS += -DNRF_SD_BLE_API_VERSION=7 # C_FLAGS += -DNRF_SD_BLE_API_VERSION=7
C_FLAGS += -DS132 # C_FLAGS += -DS132
C_FLAGS += -DSOFTDEVICE_PRESENT # C_FLAGS += -DSOFTDEVICE_PRESENT
C_FLAGS += -mcpu=$(CPU) C_FLAGS += -mcpu=$(CPU)
C_FLAGS += -mthumb -mabi=aapcs C_FLAGS += -mthumb -mabi=aapcs
C_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 C_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
@ -42,9 +42,9 @@ CXX_FLAGS += -DFLOAT_ABI_HARD
CXX_FLAGS += -DNRF52 CXX_FLAGS += -DNRF52
CXX_FLAGS += -DNRF52832_XXAA CXX_FLAGS += -DNRF52832_XXAA
CXX_FLAGS += -DNRF52_PAN_74 CXX_FLAGS += -DNRF52_PAN_74
CXX_FLAGS += -DNRF_SD_BLE_API_VERSION=7 # CXX_FLAGS += -DNRF_SD_BLE_API_VERSION=7
CXX_FLAGS += -DS132 # CXX_FLAGS += -DS132
CXX_FLAGS += -DSOFTDEVICE_PRESENT # CXX_FLAGS += -DSOFTDEVICE_PRESENT
CXX_FLAGS += -mcpu=$(CPU) CXX_FLAGS += -mcpu=$(CPU)
CXX_FLAGS += -mthumb -mabi=aapcs CXX_FLAGS += -mthumb -mabi=aapcs
CXX_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 CXX_FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
@ -64,8 +64,8 @@ A_FLAGS += -DFLOAT_ABI_HARD
A_FLAGS += -DNRF52 A_FLAGS += -DNRF52
A_FLAGS += -DNRF52832_XXAA A_FLAGS += -DNRF52832_XXAA
A_FLAGS += -DNRF52_PAN_74 A_FLAGS += -DNRF52_PAN_74
A_FLAGS += -DNRF_SD_BLE_API_VERSION=7 # A_FLAGS += -DNRF_SD_BLE_API_VERSION=7
A_FLAGS += -DS132 # A_FLAGS += -DS132
# A_FLAGS += -DSOFTDEVICE_PRESENT # A_FLAGS += -DSOFTDEVICE_PRESENT
A_FLAGS += -D__HEAP_SIZE=8192 A_FLAGS += -D__HEAP_SIZE=8192
A_FLAGS += -D__HEAP_SIZE=8192 A_FLAGS += -D__HEAP_SIZE=8192