From 89076f85f4a60c1b0a73a7ee9f7f8bb25915bde9 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 8 Aug 2018 15:21:08 +0700
Subject: [PATCH] update segger project

---
 src/segger/nrf52840_bootloader.emProject | 159 +++++++++++++++++++++--
 1 file changed, 145 insertions(+), 14 deletions(-)

diff --git a/src/segger/nrf52840_bootloader.emProject b/src/segger/nrf52840_bootloader.emProject
index 28cb6d0..c08a015 100644
--- a/src/segger/nrf52840_bootloader.emProject
+++ b/src/segger/nrf52840_bootloader.emProject
@@ -18,14 +18,14 @@
       arm_target_debug_interface_type="ADIv5"
       arm_target_device_name="nRF52840_xxAA"
       arm_target_interface_type="SWD"
-      c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;NO_VTOR_CONFIG;BOARD_PCA10056;MK_BOOTLOADER_VERSION=0x06000001;MK_DIS_FIRMWARE=&quot;S140 6.0.0, 6.0.0&quot;;S140;CONFIG_GPIO_AS_PINRESET;BLE_STACK_SUPPORT_REQD;SWI_DISABLE0;SOFTDEVICE_PRESENT;FLOAT_ABI_HARD"
-      c_user_include_directories="../;../usb;$(TusbDir);$(SdDir)/s140/headers;$(SdDir)/s140/headers/nrf52;$(Sdk11Dir)/drivers_nrf/pstorage;$(Sdk11Dir)/ble/common/;$(Sdk11Dir)/ble/ble_services/ble_dfu;$(Sdk11Dir)/ble/ble_services/ble_dis;$(Sdk11Dir)/libraries/bootloader_dfu;$(Sdk11Dir)/libraries/bootloader_dfu/hci_transport;$(Sdk11Dir)/libraries/util;$(SdkDir)/toolchain/cmsis/include;$(SdkDir)/device;$(SdkDir)/toolchain;$(SdkDir)/drivers_nrf/hal;$(SdkDir)/drivers_nrf/systick;$(SdkDir)/drivers_nrf/uart;$(SdkDir)/drivers_nrf/usbd;$(SdkDir)/drivers_nrf/common;$(SdkDir)/drivers_nrf/delay;$(SdkDir)/drivers_nrf/power;$(SdkDir)/drivers_nrf/clock;$(SdkDir)/libraries/util;$(SdkDir)/libraries/timer;$(SdkDir)/libraries/scheduler;$(SdkDir)/libraries/crc16;$(SdkDir)/libraries/util;$(SdkDir)/libraries/hci/config;$(SdkDir)/libraries/uart;$(SdkDir)/libraries/hci;$(SdkDir)/external/fprintf;$(SdkDir)/libraries/strerror;$(SdkDir)/libraries/atomic;$(SdkDir)/libraries/balloc;$(SdkDir)/libraries/experimental_log/src;$(SdkDir)/libraries/experimental_log;$(SdkDir)/libraries/experimental_section_vars;$(SdkDir)/libraries/experimental_memobj"
+      c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;NO_VTOR_CONFIG;BOARD_PCA10056;MK_BOOTLOADER_VERSION=0x06000000;MK_DIS_FIRMWARE=&quot;s140 6.0.0 r0&quot;;S140;CONFIG_GPIO_AS_PINRESET;BLE_STACK_SUPPORT_REQD;SWI_DISABLE0;SOFTDEVICE_PRESENT;FLOAT_ABI_HARD"
+      c_user_include_directories="../;../usb;../cmsis/include;$(tusbDir);$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(sdDir)/headers;$(sdDir)/headers/nrf52;$(sdk11Dir)/drivers_nrf/pstorage;$(sdk11Dir)/ble/common/;$(sdk11Dir)/ble/ble_services/ble_dfu;$(sdk11Dir)/ble/ble_services/ble_dis;$(sdk11Dir)/libraries/bootloader_dfu;$(sdk11Dir)/libraries/bootloader_dfu/hci_transport;$(sdk11Dir)/libraries/util;$(sdkDir)/toolchain/cmsis/include;$(sdkDir)/device;$(sdkDir)/toolchain;$(sdkDir)/drivers_nrf/hal;$(sdkDir)/drivers_nrf/systick;$(sdkDir)/drivers_nrf/uart;$(sdkDir)/drivers_nrf/usbd;$(sdkDir)/drivers_nrf/common;$(sdkDir)/drivers_nrf/delay;$(sdkDir)/drivers_nrf/power;$(sdkDir)/drivers_nrf/clock;$(sdkDir)/libraries/util;$(sdkDir)/libraries/timer;$(sdkDir)/libraries/scheduler;$(sdkDir)/libraries/crc16;$(sdkDir)/libraries/util;$(sdkDir)/libraries/hci/config;$(sdkDir)/libraries/uart;$(sdkDir)/libraries/hci;$(sdkDir)/external/fprintf;$(sdkDir)/libraries/strerror;$(sdkDir)/libraries/atomic;$(sdkDir)/libraries/balloc;$(sdkDir)/libraries/experimental_log/src;$(sdkDir)/libraries/experimental_log;$(sdkDir)/libraries/experimental_section_vars;$(sdkDir)/libraries/experimental_memobj"
       debug_register_definition_file="$(ProjectDir)/nrf52840_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
       linker_memory_map_file="$(ProjectDir)/nRF52840_xxAA_MemoryMap.xml"
       linker_section_placement_file="$(ProjectDir)/flash_placement.xml"
-      macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;SdkDir=../../lib/sdk/components;Sdk11Dir=../../lib/sdk11/components;SdDir=../../lib/softdevice/6.0.0;TusbDir=../../lib/tinyusb/src"
+      macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;sdkDir=../../lib/sdk/components;sdk11Dir=../../lib/sdk11/components;sdDir=../../lib/softdevice/s140/6.0.0;tusbDir=../../lib/tinyusb/src;nrfxDir=../../lib/nrfx"
       project_directory=""
       project_type="Executable"
       target_reset_script="Reset();"
@@ -46,8 +46,6 @@
       <file file_name="thumb_crt0.s" />
       <file file_name="flash_placement.xml" />
       <file file_name="nRF52840_xxAA_MemoryMap.xml" />
-      <file file_name="ses_nRF_Startup.s" />
-      <file file_name="ses_nrf52840_Vectors.s" />
     </folder>
     <folder Name="src">
       <file file_name="../boards.h" />
@@ -68,6 +66,32 @@
         </folder>
         <file file_name="../usb/msc_uf2.c" />
         <file file_name="../usb/msc_uf2.h" />
+        <file file_name="../usb/usb.c" />
+      </folder>
+      <folder Name="cmsis">
+        <folder Name="include">
+          <file file_name="../cmsis/include/arm_common_tables.h" />
+          <file file_name="../cmsis/include/arm_const_structs.h" />
+          <file file_name="../cmsis/include/arm_math.h" />
+          <file file_name="../cmsis/include/cmsis_armcc.h" />
+          <file file_name="../cmsis/include/cmsis_armcc_V6.h" />
+          <file file_name="../cmsis/include/cmsis_gcc.h" />
+          <file file_name="../cmsis/include/core_cm0.h" />
+          <file file_name="../cmsis/include/core_cm0plus.h" />
+          <file file_name="../cmsis/include/core_cm3.h" />
+          <file file_name="../cmsis/include/core_cm4.h" />
+          <file file_name="../cmsis/include/core_cm7.h" />
+          <file file_name="../cmsis/include/core_cmFunc.h" />
+          <file file_name="../cmsis/include/core_cmInstr.h" />
+          <file file_name="../cmsis/include/core_cmSimd.h" />
+          <file file_name="../cmsis/include/core_sc000.h" />
+          <file file_name="../cmsis/include/core_sc300.h" />
+        </folder>
+      </folder>
+      <folder Name="boards">
+        <file file_name="../boards/feather52832.h" />
+        <file file_name="../boards/feather52840.h" />
+        <file file_name="../boards/pca10056.h" />
       </folder>
     </folder>
     <configuration
@@ -138,7 +162,6 @@
               <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" />
               <file file_name="../../lib/sdk11/components/libraries/util/nrf_log.h" />
             </folder>
           </folder>
@@ -191,7 +214,7 @@
             <file file_name="../../lib/tinyusb/src/device/usbd.c" />
             <file file_name="../../lib/tinyusb/src/device/usbd.h" />
             <file file_name="../../lib/tinyusb/src/device/usbd_pvt.h" />
-            <file file_name="../../lib/tinyusb/src/device/usbd_desc.c" />
+            <file file_name="../../lib/tinyusb/src/device/usbd_auto_desc.c" />
           </folder>
           <folder Name="osal">
             <file file_name="../../lib/tinyusb/src/osal/osal.c" />
@@ -238,6 +261,120 @@
           </folder>
         </folder>
       </folder>
+      <folder Name="nrfx">
+        <file file_name="../../lib/nrfx/nrfx.h" />
+        <folder Name="drivers">
+          <file file_name="../../lib/nrfx/drivers/nrfx_common.h" />
+          <file file_name="../../lib/nrfx/drivers/nrfx_errors.h" />
+          <folder Name="include">
+            <file file_name="../../lib/nrfx/drivers/include/nrf_bitmask.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_adc.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_clock.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_comp.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_gpiote.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_i2s.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_lpcomp.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_pdm.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_power.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_power_clock.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_ppi.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_pwm.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_qdec.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_qspi.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_rng.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_rtc.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_saadc.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_spi.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_spim.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_spis.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_swi.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_systick.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_timer.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_twi.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_twim.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_twis.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_uart.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_uarte.h" />
+            <file file_name="../../lib/nrfx/drivers/include/nrfx_wdt.h" />
+          </folder>
+          <folder Name="src">
+            <file file_name="../../lib/nrfx/drivers/src/nrfx_power.c" />
+          </folder>
+        </folder>
+        <folder Name="hal">
+          <file file_name="../../lib/nrfx/hal/nrf_adc.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_ccm.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_clock.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_comp.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_ecb.c" />
+          <file file_name="../../lib/nrfx/hal/nrf_ecb.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_egu.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_gpio.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_gpiote.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_i2s.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_lpcomp.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_nvmc.c" />
+          <file file_name="../../lib/nrfx/hal/nrf_nvmc.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_pdm.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_power.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_ppi.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_pwm.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_qdec.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_qspi.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_radio.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_rng.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_rtc.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_saadc.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_spi.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_spim.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_spis.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_systick.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_temp.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_timer.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_twi.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_twim.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_twis.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_uart.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_uarte.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_usbd.h" />
+          <file file_name="../../lib/nrfx/hal/nrf_wdt.h" />
+        </folder>
+        <folder Name="mdk">
+          <file file_name="../../lib/nrfx/mdk/compiler_abstraction.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf52.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf52832_peripherals.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf52840.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf52840_bitfields.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf52840_peripherals.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf52_bitfields.h" />
+          <file file_name="../../lib/nrfx/mdk/nrf_peripherals.h" />
+          <file file_name="../../lib/nrfx/mdk/ses_startup_nrf52.s">
+            <configuration
+              Name="Feather52840 Size++"
+              build_exclude_from_build="Yes" />
+          </file>
+          <file file_name="../../lib/nrfx/mdk/ses_startup_nrf52840.s" />
+          <file file_name="../../lib/nrfx/mdk/ses_startup_nrf_common.s" />
+          <file file_name="../../lib/nrfx/mdk/startup_config.h" />
+          <file file_name="../../lib/nrfx/mdk/system_nrf52.c">
+            <configuration
+              Name="Feather52840 Size++"
+              build_exclude_from_build="Yes" />
+          </file>
+          <file file_name="../../lib/nrfx/mdk/system_nrf52.h" />
+          <file file_name="../../lib/nrfx/mdk/system_nrf52840.c" />
+          <file file_name="../../lib/nrfx/mdk/system_nrf52840.h" />
+        </folder>
+        <folder Name="soc">
+          <file file_name="../../lib/nrfx/soc/nrfx_coredep.h" />
+          <file file_name="../../lib/nrfx/soc/nrfx_irqs.h" />
+          <file file_name="../../lib/nrfx/soc/nrfx_irqs_nrf51.h" />
+          <file file_name="../../lib/nrfx/soc/nrfx_irqs_nrf52810.h" />
+          <file file_name="../../lib/nrfx/soc/nrfx_irqs_nrf52832.h" />
+          <file file_name="../../lib/nrfx/soc/nrfx_irqs_nrf52840.h" />
+        </folder>
+      </folder>
     </folder>
     <configuration
       Name="Debug Size++"
@@ -249,11 +386,5 @@
     c_preprocessor_definitions="DEBUG"
     gcc_debugging_level="Level 3"
     gcc_optimization_level="None" />
-  <configuration
-    Name="Release"
-    c_preprocessor_definitions="NDEBUG"
-    gcc_debugging_level="None"
-    gcc_omit_frame_pointer="Yes"
-    gcc_optimization_level="Level 1" />
-  <configuration Name="Debug Size++" />
+  <configuration Name="Feather52840 Size++" />
 </solution>