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

make update

Browse Source
This commit is contained in:
hathach 2018-08-07 13:25:51 +07:00
parent 83ec6bff4a
commit 2847b319f2
3 changed files with 186 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Makefile
View File

@ -147,12 +147,13 @@ C_SOURCE_FILES += $(SDK_PATH)/drivers_nrf/hal/nrf_nvmc.c
ifneq ($(IS_NRF52840),) ifneq ($(IS_NRF52840),)
# src
C_SOURCE_FILES += $(SRC_PATH)/usb/tusb_descriptors.c C_SOURCE_FILES += $(SRC_PATH)/usb/tusb_descriptors.c
C_SOURCE_FILES += $(SRC_PATH)/usb/usb.c C_SOURCE_FILES += $(SRC_PATH)/usb/usb.c
C_SOURCE_FILES += $(SRC_PATH)/usb/msc_uf2.c C_SOURCE_FILES += $(SRC_PATH)/usb/msc_uf2.c
C_SOURCE_FILES += $(SRC_PATH)/usb/uf2/ghostfat.c C_SOURCE_FILES += $(SRC_PATH)/usb/uf2/ghostfat.c
# nrfx
C_SOURCE_FILES += $(NRFX_PATH)/mdk/system_nrf52840.c C_SOURCE_FILES += $(NRFX_PATH)/mdk/system_nrf52840.c
# Tinyusb stack # Tinyusb stack
@ -221,7 +222,7 @@ IPATH += $(SDK_PATH)/drivers_nrf/delay
#IPATH += $(SDK_PATH)/drivers_nrf/uart #IPATH += $(SDK_PATH)/drivers_nrf/uart
#IPATH += $(SDK_PATH)/drivers_nrf/power #IPATH += $(SDK_PATH)/drivers_nrf/power
#IPATH += $(SDK_PATH)/drivers_nrf/usbd #IPATH += $(SDK_PATH)/drivers_nrf/usbd
IPATH += $(SDK_PATH)/device #IPATH += $(SDK_PATH)/device
# Softdevice # Softdevice
IPATH += $(SD_PATH)/headers IPATH += $(SD_PATH)/headers
@ -280,7 +281,7 @@ endif
# keep every function in separate section. This will allow linker to dump unused functions # keep every function in separate section. This will allow linker to dump unused functions
LDFLAGS += -Xlinker -Map=$(BUILD)/$(OUTPUT_FILENAME).map LDFLAGS += -Xlinker -Map=$(BUILD)/$(OUTPUT_FILENAME).map
LDFLAGS += -mthumb -mabi=aapcs -L$(SRC_PATH)/ -T$(LD_FILE) LDFLAGS += -mthumb -mabi=aapcs -L$(SRC_PATH)/linker -T$(LD_FILE)
LDFLAGS += -mcpu=cortex-m4 LDFLAGS += -mcpu=cortex-m4
LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
@ -295,9 +296,7 @@ LDFLAGS += --specs=nano.specs -lc -lnosys
# #
#****************************************************************************** #******************************************************************************
ASMFLAGS += -x assembler-with-cpp ASMFLAGS += -x assembler-with-cpp
ASMFLAGS += -DNRF52840_XXAA
ASMFLAGS += -D__HEAP_SIZE=0 ASMFLAGS += -D__HEAP_SIZE=0
ASMFLAGS += -DS140
ASMFLAGS += -DCONFIG_GPIO_AS_PINRESET ASMFLAGS += -DCONFIG_GPIO_AS_PINRESET
ASMFLAGS += -DBLE_STACK_SUPPORT_REQD ASMFLAGS += -DBLE_STACK_SUPPORT_REQD
ASMFLAGS += -DBSP_DEFINES_ONLY ASMFLAGS += -DBSP_DEFINES_ONLY
@ -305,6 +304,19 @@ ASMFLAGS += -DSWI_DISABLE0
ASMFLAGS += -DSOFTDEVICE_PRESENT ASMFLAGS += -DSOFTDEVICE_PRESENT
ASMFLAGS += -DFLOAT_ABI_HARD ASMFLAGS += -DFLOAT_ABI_HARD
ifneq ($(IS_NRF52840),)
ASMFLAGS += -DNRF52840_XXAA
ASMFLAGS += -DS140
else
ASMFLAGS += -DNRF52
ASMFLAGS += -DS132
endif
C_SOURCE_FILE_NAMES = $(notdir $(C_SOURCE_FILES)) C_SOURCE_FILE_NAMES = $(notdir $(C_SOURCE_FILES))

2
src/nrf52_common.ld → src/linker/nrf_common.ld
View File

@ -1,4 +1,4 @@
/* Linker script for Nordic Semiconductor nRF52 devices /* Linker script for Nordic Semiconductor nRF devices
* *
* Version: Sourcery G++ 4.5-1 * Version: Sourcery G++ 4.5-1
* Support: https://support.codesourcery.com/GNUToolchain/ * Support: https://support.codesourcery.com/GNUToolchain/

2
src/linker/s140_6.0.0.ld
View File

@ -77,4 +77,4 @@ SECTIONS
/* other placements follow here... */ /* other placements follow here... */
} }
INCLUDE "nrf52_common.ld" INCLUDE "nrf_common.ld"