remove sdk, add nrfx as submodule

update segger project to work with nrfx

1 files changed, 27 insertions, 35 deletions

diff --git a/examples/device/nrf52840/segger/nrf52840.emProject b/examples/device/nrf52840/segger/nrf52840.emProject
index 8c954ccd5..9d4a90a16 100644
--- a/examples/device/nrf52840/segger/nrf52840.emProject
+++ b/examples/device/nrf52840/segger/nrf52840.emProject
@@ -19,13 +19,13 @@
       arm_target_device_name="nRF52840_xxAA"
       arm_target_interface_type="SWD"
       c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_PCA10056"
-      c_user_include_directories="$(TusbDir)/hw/cmsis/Include;$(TusbDir)/hw;$(TusbDir)/src;$(SdkDir);$(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)/external/fprintf;$(SdkDir)/libraries/util;$(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;$(SdkDir)/softdevice/s140/headers;$(SdkDir)/softdevice/s140/headers/nrf52;$(SdkDir)/softdevice/common;../src"
+      c_user_include_directories="../src;$(tusbDir)/hw/cmsis/Include;$(tusbDir)/hw;$(tusbDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include"
       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;TusbDir=../../../..;SdkDir=../../../../hw/mcu/nordic/nrf52/sdk"
+      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;tusbDir=../../../..;nrfxDir=../../../../hw/mcu/nordic/nrfx"
       project_directory=""
       project_type="Executable"
       target_reset_script="Reset();"
@@ -71,42 +71,34 @@
       </folder>
       <folder Name="mcu">
         <folder Name="nordic">
-          <folder Name="nrf52">
-            <folder Name="sdk">
-              <file file_name="../../../../hw/mcu/nordic/nrf52/sdk/sdk_config.h" />
-              <folder
-                Name="device"
-                path="../../../../hw/mcu/nordic/nrf52/sdk/device" />
-              <folder
-                Name="documentation"
-                path="../../../../hw/mcu/nordic/nrf52/sdk/documentation" />
-              <folder
-                Name="drivers_nrf"
-                exclude=""
-                filter="*.c;*.h;*.s;*.S"
-                path="../../../../hw/mcu/nordic/nrf52/sdk/drivers_nrf"
-                recurse="Yes" />
-              <folder
-                Name="libraries"
-                exclude=""
-                filter="*.c;*.h;*.s;*.S"
-                path="../../../../hw/mcu/nordic/nrf52/sdk/libraries"
-                recurse="Yes" />
-              <folder
-                Name="softdevice"
-                exclude=""
-                filter="*.c;*.h;*.s;*.S"
-                path="../../../../hw/mcu/nordic/nrf52/sdk/softdevice"
-                recurse="Yes" />
-              <folder Name="toolchain">
-                <file file_name="../../../../hw/mcu/nordic/nrf52/sdk/toolchain/system_nrf52840.c" />
-                <file file_name="../../../../hw/mcu/nordic/nrf52/sdk/toolchain/system_nrf52840.h" />
-                <folder
-                  Name="ses"
-                  path="../../../../hw/mcu/nordic/nrf52/sdk/toolchain/ses" />
+          <folder Name="nrfx">
+            <folder Name="drivers">
+              <folder Name="include" />
+              <folder Name="src">
+                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_power.c" />
+                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_power_clock.c" />
               </folder>
             </folder>
+            <folder Name="hal" />
+            <folder Name="mdk">
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf51_to_nrf52840.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52840_bitfields.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52840.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52840_peripherals.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52_to_nrf52840.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/ses_startup_nrf52840.s" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/ses_startup_nrf_common.s" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/system_nrf52840.c" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/system_nrf52840.h" />
+            </folder>
+            <folder Name="soc">
+              <file file_name="../../../../hw/mcu/nordic/nrfx/soc/nrfx_irqs.h" />
+              <file file_name="../../../../hw/mcu/nordic/nrfx/soc/nrfx_irqs_nrf52840.h" />
+            </folder>
           </folder>
+          <file file_name="../../../../hw/mcu/nordic/nrf_drv_usbd_errata.h" />
+          <file file_name="../../../../hw/mcu/nordic/nrfx_config.h" />
+          <file file_name="../../../../hw/mcu/nordic/nrfx_glue.h" />
         </folder>
       </folder>
     </folder>