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

remove singble bank in binary name

Browse Source
This commit is contained in:
hathach 2018-06-26 14:28:03 +07:00
parent b42df5f72b
commit 6139422e1e
5 changed files with 639 additions and 670 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/feather52840/6.0.0/single/feather52840_bootloader_6.0.0_s140_single.bin → bin/feather52840/6.0.0/feather52840_bootloader_6.0.0_s140.bin
View File

Binary file not shown.

1258
bin/feather52840/6.0.0/single/feather52840_bootloader_6.0.0_s140_single.hex → bin/feather52840/6.0.0/feather52840_bootloader_6.0.0_s140.hex
View File

File diff suppressed because it is too large Load Diff

BIN
bin/feather52840/6.0.0/single/feather52840_bootloader_6.0.0_s140_single.zip → bin/feather52840/6.0.0/feather52840_bootloader_6.0.0_s140.zip
View File

Binary file not shown.

25
src/Makefile
View File

@ -16,30 +16,22 @@ VERSION_MAJOR = 6
VERSION_MINOR = 0
VERSION_REVISION = 0
SDK_PATH = ../../lib/sdk/components
SDK11_PATH = ../../lib/sdk11/components
SDK_PATH = ../lib/sdk/components
SDK11_PATH = ../lib/sdk11/components
SRC_PATH = ..
TUSB_PATH = ../../lib/tinyusb/src
SRC_PATH = .
TUSB_PATH = ../lib/tinyusb/src
SD_NAME = s140
SD_VERSION = 6.0.0
MK_DIS_FIRMWARE = "$(subst s,S,$(SD_NAME)) $(SD_VERSION), $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)"
SD_PATH = ../../lib/softdevice/$(SD_VERSION)
SD_PATH = ../lib/softdevice/$(SD_VERSION)
SD_HEX = $(SD_PATH)/$(SD_NAME)/hex/$(SD_NAME)_nrf52_$(SD_VERSION)_softdevice.hex
LINKER_SCRIPT = $(SRC_PATH)/$(SD_NAME)_$(SD_VERSION).ld
ifeq ($(VERSION_SINGLEBANK),1)
BANKMODE = single
C_SOURCE_FILES += $(SDK_PATH)/libraries/bootloader_dfu/dfu_single_bank.c
else
BANKMODE = dual
C_SOURCE_FILES += $(SDK_PATH)/libraries/bootloader_dfu/dfu_dual_bank.c
endif
BOOTLOADER_SD_SUFFIX = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)_$(SD_NAME)_$(BANKMODE)
BOOTLOADER_SD_SUFFIX = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)_$(SD_NAME)
#******************************************************************************
# Tool configure
@ -95,6 +87,7 @@ C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/bootloader_util.c
C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_init_template.c
C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_transport_serial.c
C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_transport_ble.c
C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_single_bank.c
C_SOURCE_FILES += $(SDK11_PATH)/drivers_nrf/pstorage/pstorage_raw.c
@ -308,7 +301,7 @@ BOOTLOADER_WITH_SD_NAME := $(OUTPUT_FILENAME)_$(BOOTLOADER_SD_SUFFIX)
# Target for Feather nrf52 board
feather52840: OUTPUT_FILENAME := feather52840_bootloader
feather52840: FINAL_BIN_DIR := ../../bin/feather52840/$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)/$(BANKMODE)
feather52840: FINAL_BIN_DIR := ../bin/feather52840/$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)
feather52840: CFLAGS += -DBOARD_FEATHER52840
feather52840: $(BUILD_DIRECTORIES) $(OBJECTS)
@echo Linking target: $(OUTPUT_FILENAME).out
@ -317,7 +310,7 @@ feather52840: $(BUILD_DIRECTORIES) $(OBJECTS)
# Target for Metro nrf52 board
metro52: OUTPUT_FILENAME := metro52_bootloader
metro52: FINAL_BIN_DIR := ../../bin/metro52/$(BANKMODE)
metro52: FINAL_BIN_DIR := ../bin/metro52/$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)
metro52: CFLAGS += -DBOARD_METRO52
metro52: $(BUILD_DIRECTORIES) $(OBJECTS)
@echo Linking target: $(OUTPUT_FILENAME).out

26
src/segger/nrf52840_bootloader.emProject
View File

@ -76,10 +76,6 @@
link_use_linker_script_file="No"
linker_section_placement_file="flash_placement.xml" />
<configuration Name="Debug Single" gcc_optimization_level="Debug" />
<configuration Name="Debug Dual" gcc_optimization_level="Debug" />
<configuration
Name="Release Dual"
gcc_optimization_level="Optimize For Size" />
<configuration
Name="Release Single"
gcc_optimization_level="Optimize For Size" />
@ -126,27 +122,8 @@
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_bank_internal.h" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_ble_svc.h" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_dual_bank.c">
<configuration
Name="Debug Single"
build_exclude_from_build="Yes" />
<configuration
Name="Release Single"
build_exclude_from_build="Yes" />
<configuration
Name="Debug Size++"
build_exclude_from_build="Yes" />
</file>
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_init.h" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_init_template.c" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c">
<configuration
Name="Debug Dual"
build_exclude_from_build="Yes" />
<configuration
Name="Release Dual"
build_exclude_from_build="Yes" />
</file>
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_transport.h" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c" />
@ -158,6 +135,7 @@
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h" />
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/hci_transport/hci_transport_config.h" />
</folder>
<file file_name="../../lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c" />
</folder>
<folder Name="util">
<file file_name="../../lib/sdk11/components/libraries/util/nrf_log.c" />
@ -276,7 +254,5 @@
gcc_debugging_level="None"
gcc_omit_frame_pointer="Yes"
gcc_optimization_level="Level 1" />
<configuration Name="Debug Dual" />
<configuration Name="Release Dual" />
<configuration Name="Debug Size++" />
</solution>