From 9b5c36b161c03145de166f1ee4eb241fc70da47c Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 8 Feb 2018 13:50:01 +0700
Subject: [PATCH] update makefile

---
 src/make_common.mk | 50 ++++++++++++----------------------------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/src/make_common.mk b/src/make_common.mk
index c3addaf..9f361cf 100644
--- a/src/make_common.mk
+++ b/src/make_common.mk
@@ -10,18 +10,18 @@
 # - SD_VERSION : e.g 5.1.0
 # - SD_HEX     : path to bootloader hex binary
 #******************************************************************************
-VERSION_MAJOR    = 5
-VERSION_MINOR    = 1
+VERSION_MAJOR    = 6
+VERSION_MINOR    = 0
 VERSION_REVISION = 0
 
 SDK_PATH         = ../../nRF5_SDK_11.0.0_89a8197/components
 SRC_PATH         = ..
 
-SD_NAME          = s132
-SD_VERSION       = 5.1.0
+SD_NAME          = s140
+SD_VERSION       = 6.0.0
 
 SD_PATH          = ../../softdevice/$(SD_NAME)/$(SD_VERSION)
-SD_HEX           = $(SD_PATH)/hex/$(SD_NAME)_nrf52_$(SD_VERSION)_softdevice.hex
+SD_HEX           = $(SD_PATH)/hex/$(SD_NAME)_nrf52840_$(SD_VERSION)-6.alpha_softdevice.hex
 LINKER_SCRIPT    = $(SRC_PATH)/$(SD_NAME)_$(SD_VERSION).ld
 
 ifeq ($(VERSION_SINGLEBANK),1)
@@ -182,28 +182,16 @@ BUILD_DIRECTORIES := $(sort $(OBJECT_DIRECTORY) $(OUTPUT_BINARY_DIRECTORY) $(LIS
 # Defined Symbol (MACROS)
 #*************************
 CFLAGS += -DBOOTLOADER_VERSION=0x0$(VERSION_MAJOR)0$(VERSION_MINOR)0$(VERSION_REVISION)0$(VERSION_SINGLEBANK)UL
-CFLAGS += -DNRF52
-CFLAGS += -DNRF52_PAN_12
-CFLAGS += -DNRF52_PAN_15
-CFLAGS += -DNRF52_PAN_58
-CFLAGS += -DNRF52_PAN_55
-CFLAGS += -DNRF52_PAN_54
-CFLAGS += -DNRF52_PAN_31
-CFLAGS += -DNRF52_PAN_30
-CFLAGS += -DNRF52_PAN_51
-CFLAGS += -DNRF52_PAN_36
-CFLAGS += -DNRF52_PAN_53
+CFLAGS += -DNRF52840_XXAA
 CFLAGS += -D__HEAP_SIZE=0
-CFLAGS += -DS132
+CFLAGS += -DS140
 CFLAGS += -DCONFIG_GPIO_AS_PINRESET
 CFLAGS += -DBLE_STACK_SUPPORT_REQD
 CFLAGS += -DBSP_DEFINES_ONLY
 CFLAGS += -DSWI_DISABLE0
-CFLAGS += -DNRF52_PAN_20
-CFLAGS += -DNRF52_PAN_64
 CFLAGS += -DSOFTDEVICE_PRESENT
-CFLAGS += -DNRF52_PAN_62
-CFLAGS += -DNRF52_PAN_63
+
+CFLAGS += -DFLOAT_ABI_HARD
 
 CFLAGS += -DDFU_APP_DATA_RESERVED=7*4096
 
@@ -238,28 +226,16 @@ LDFLAGS += --specs=nano.specs -lc -lnosys
 #
 #******************************************************************************
 ASMFLAGS += -x assembler-with-cpp
-ASMFLAGS += -DNRF52
-ASMFLAGS += -DNRF52_PAN_12
-ASMFLAGS += -DNRF52_PAN_15
-ASMFLAGS += -DNRF52_PAN_58
-ASMFLAGS += -DNRF52_PAN_55
-ASMFLAGS += -DNRF52_PAN_54
-ASMFLAGS += -DNRF52_PAN_31
-ASMFLAGS += -DNRF52_PAN_30
-ASMFLAGS += -DNRF52_PAN_51
-ASMFLAGS += -DNRF52_PAN_36
-ASMFLAGS += -DNRF52_PAN_53
+ASMFLAGS += -DNRF52840_XXAA
 ASMFLAGS += -D__HEAP_SIZE=0
-ASMFLAGS += -DS132
+ASMFLAGS += -DS140
 ASMFLAGS += -DCONFIG_GPIO_AS_PINRESET
 ASMFLAGS += -DBLE_STACK_SUPPORT_REQD
 ASMFLAGS += -DBSP_DEFINES_ONLY
 ASMFLAGS += -DSWI_DISABLE0
-ASMFLAGS += -DNRF52_PAN_20
-ASMFLAGS += -DNRF52_PAN_64
 ASMFLAGS += -DSOFTDEVICE_PRESENT
-ASMFLAGS += -DNRF52_PAN_62
-ASMFLAGS += -DNRF52_PAN_63
+
+ASMFLAGS += -DFLOAT_ABI_HARD
 
 MAKEFILE_NAME := $(MAKEFILE_LIST)
 MAKEFILE_DIR := $(dir $(MAKEFILE_NAME) )