Merge pull request #13 from charlesportwoodii/sdk16

Upgrade SDK 16 / SD 7
kaidyth · Dec 2, 2019 · e8e1572 · e8e1572
2 parents 92e8e98 + 8f57501
commit e8e1572
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: c
 
 cache:
   directories:
-    - $HOME/gcc-arm-none-eabi-8-2019-q3-update
+    - $HOME/gcc-arm-none-eabi-9-2019-q4-major
     - $HOME/nrf_sdk/16.0.0
 
 addons:
@@ -15,9 +15,9 @@ addons:
 
 env:
   global:
-    - GNU_INSTALL_ROOT="$HOME/gcc-arm-none-eabi-8-2019-q3-update/bin/"
+    - GNU_INSTALL_ROOT="$HOME/gcc-arm-none-eabi-9-2019-q4-major/bin/"
     - NORDIC_SDK_PATH="$HOME/nrf_sdk/16.0.0"
-    - PATH="$PATH:$HOME/gcc-arm-none-eabi-8-2019-q3-update/bin:$HOME/mergehex"
+    - PATH="$PATH:$HOME/gcc-arm-none-eabi-9-2019-q4-major/bin:$HOME/mergehex"
 
   matrix:
     - BOARD=sparkfun-pro-mini

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-if [ -z "$(ls -A $HOME/gcc-arm-none-eabi-8-2019-q3-update)" ]; then
+if [ -z "$(ls -A $HOME/gcc-arm-none-eabi-9-2019-q4-major)" ]; then
     cd $HOME
-    wget https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/8-2019q3/RC1.1/gcc-arm-none-eabi-8-2019-q3-update-linux.tar.bz2
-    tar -xf gcc-arm-none-eabi-8-2019-q3-update-linux.tar.bz2
-    rm -rf gcc-arm-none-eabi-8-2019-q3-update-linux.tar.bz2
+    wget https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
+    tar -xf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
+    rm -rf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
 else
-    echo "gcc-arm-none-eabi-8-2019-q3-update-linux is already installed."
+    echo "gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux is already installed."
 fi
 
 if [ -z "$(ls -A $HOME/nrf_sdk/16.0.0)" ]; then

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 FROM ubuntu:18.04
 LABEL maintainer="Charles R. Portwood II <charlesportwoodii@erianna.com>"
 
-ENV GNU_INSTALL_ROOT="/root/gcc-arm-none-eabi-8-2019-q3-update/bin/"
+ENV GNU_INSTALL_ROOT="/root/gcc-arm-none-eabi-9-2019-q4-update/bin/"
 ENV NORDIC_SDK_PATH="/root/nrf_sdk/16.0.0"
-ENV PATH="$PATH:/root/gcc-arm-none-eabi-8-2019-q3-update/bin:/root/mergehex:/root/nrfjprog:/root/.local/bin"
+ENV PATH="$PATH:/root/gcc-arm-none-eabi-9-2019-q4-update/bin:/root/mergehex:/root/nrfjprog:/root/.local/bin"
 
 ENV BOARD=""
 ENV DEBUG=0

diff --git a/boards/Makefile.boards b/boards/Makefile.boards
@@ -130,7 +130,9 @@ SRC_FILES += \
   $(SDK_ROOT)/components/libraries/crypto/backend/oberon/oberon_backend_hash.c \
   $(SDK_ROOT)/components/libraries/crypto/backend/oberon/oberon_backend_hmac.c \
   $(SDK_ROOT)/components/libraries/bsp/bsp.c \
-  $(SDK_ROOT)/components/libraries/timer/app_timer.c \
+  $(SDK_ROOT)/components/libraries/timer/app_timer2.c \
+  $(SDK_ROOT)/components/libraries/timer/drv_rtc.c \
+  $(SDK_ROOT)/components/libraries/sortlist/nrf_sortlist.c \
   $(SDK_ROOT)/components/libraries/button/app_button.c \
   $(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_gpiote.c \
   $(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_pwm.c \
@@ -171,6 +173,7 @@ INC_FOLDERS += \
   $(SDK_ROOT)/components/libraries/stack_info \
   $(SDK_ROOT)/components/libraries/crypto/backend/nrf_hw \
   $(SDK_ROOT)/components/libraries/log \
+  $(SDK_ROOT)/components/libraries/sortlist \
   $(SDK_ROOT)/external/nrf_oberon \
   $(SDK_ROOT)/components/libraries/strerror \
   $(SDK_ROOT)/components/libraries/crypto/backend/mbedtls \
@@ -234,12 +237,14 @@ OPT += -flto
 
 # C flags common to all targets
 CFLAGS += $(OPT)
+CFLAGS += -DAPP_TIMER_V2
+CFLAGS += -DAPP_TIMER_V2_RTC1_ENABLED
 CFLAGS += -DBLE_STACK_SUPPORT_REQD
 CFLAGS += -DFLOAT_ABI_HARD
 CFLAGS += -DNRF52840_XXAA
 CFLAGS += -DNRF_DFU_SETTINGS_VERSION=2
 CFLAGS += -DNRF_DFU_SVCI_ENABLED
-CFLAGS += -DNRF_SD_BLE_API_VERSION=6
+CFLAGS += -DNRF_SD_BLE_API_VERSION=7
 CFLAGS += -DS140
 CFLAGS += -DSOFTDEVICE_PRESENT
 CFLAGS += -DSVC_INTERFACE_CALL_AS_NORMAL_FUNCTION
@@ -271,12 +276,14 @@ ASMFLAGS += -g3
 ASMFLAGS += -mcpu=cortex-m4
 ASMFLAGS += -mthumb -mabi=aapcs
 ASMFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
+ASMFLAGS += -DAPP_TIMER_V2
+ASMFLAGS += -DAPP_TIMER_V2_RTC1_ENABLED
 ASMFLAGS += -DBLE_STACK_SUPPORT_REQD
 ASMFLAGS += -DFLOAT_ABI_HARD
 ASMFLAGS += -DNRF52840_XXAA
 ASMFLAGS += -DNRF_DFU_SETTINGS_VERSION=2
 ASMFLAGS += -DNRF_DFU_SVCI_ENABLED
-ASMFLAGS += -DNRF_SD_BLE_API_VERSION=6
+ASMFLAGS += -DNRF_SD_BLE_API_VERSION=7
 ASMFLAGS += -DS140
 ASMFLAGS += -DSOFTDEVICE_PRESENT
 ASMFLAGS += -DSVC_INTERFACE_CALL_AS_NORMAL_FUNCTION

diff --git a/include/sdk_config.h b/include/sdk_config.h
@@ -6739,6 +6739,11 @@
 #define NRF_DFU_SERIAL_UART_USES_HWFC 0
 #endif
 
+
+#ifndef NRF_SORTLIST_ENABLED
+#define NRF_SORTLIST_ENABLED 1
+#endif
+
 // <<< end of configuration section >>>
 #endif //SDK_CONFIG_H