diff --git a/TESTS/mbed_hal/critical_section/main.cpp b/TESTS/mbed_hal/critical_section/main.cpp index 3f7dd920fe5..e8dc26daee2 100644 --- a/TESTS/mbed_hal/critical_section/main.cpp +++ b/TESTS/mbed_hal/critical_section/main.cpp @@ -20,7 +20,7 @@ #include "greentea-client/test_env.h" #include "mbed.h" #include "cmsis.h" -#if defined(TARGET_NRF5) || defined(TARGET_NRF5x) // for all NRF5x targets +#if defined(TARGET_NRF5x) // for all NRF5x targets #include "nrf_nvic.h" // for __NRF_NVIC_APP_IRQS_0 / __NRF_NVIC_APP_IRQS_1 #endif @@ -30,11 +30,11 @@ bool test_are_interrupts_enabled(void) { // NRF5x targets don't disable interrupts when in critical section, instead they mask application interrupts this is due to BLE stack // (BLE to be operational requires some interrupts to be always enabled) -#ifdef TARGET_NRF52 - // check if APP interrupts are masked for NRF52_DK board +#if defined(TARGET_NRF52) + // check if APP interrupts are masked for NRF52 boards return (((NVIC->ISER[0] & __NRF_NVIC_APP_IRQS_0) != 0) || ((NVIC->ISER[1] & __NRF_NVIC_APP_IRQS_1) != 0)); -#elif TARGET_NRF5 - // check if APP interrupts are masked for other NRF5 boards +#elif defined(TARGET_NRF51) + // check if APP interrupts are masked for other NRF51 boards return ((NVIC->ISER[0] & __NRF_NVIC_APP_IRQS_0) != 0); #else #if defined(__CORTEX_A9) diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/CHANGELOG.md b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/CHANGELOG.md similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/CHANGELOG.md rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/CHANGELOG.md diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/LICENSE b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/LICENSE similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/LICENSE rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/LICENSE diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/apache-2.0.txt b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/apache-2.0.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/apache-2.0.txt rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/apache-2.0.txt diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/module.json b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/module.json similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/module.json rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/module.json diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/softdevice_nrf51822_licence_agreement.txt b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/softdevice_nrf51822_licence_agreement.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/softdevice_nrf51822_licence_agreement.txt rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/softdevice_nrf51822_licence_agreement.txt diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_clock.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_clock.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_clock.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_clock.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_gap.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_gap.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_gap.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_gap.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_gap.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_security.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_security.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_security.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_security.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security_pm.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_security_pm.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security_pm.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/btle_security_pm.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/custom/custom_helper.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/custom/custom_helper.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/custom/custom_helper.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/custom/custom_helper.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/btle/custom/custom_helper.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/ansi_escape.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/ansi_escape.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/ansi_escape.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/ansi_escape.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/assertion.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/assertion.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/assertion.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/assertion.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/binary.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/binary.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/binary.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/binary.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/ble_error.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/ble_error.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/ble_error.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/ble_error.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/common.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/common.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/common.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/common.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/compiler.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/compiler.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/common/compiler.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/common/compiler.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5XPalGattClient.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5XPalGattClient.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5XPalGattClient.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5XPalGattClient.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5XPalGattClient.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5XPalGattClient.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5XPalGattClient.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5XPalGattClient.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGap.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGattServer.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGattServer.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGattServer.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGattServer.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xGattServer.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xSecurityManager.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xSecurityManager.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xSecurityManager.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xSecurityManager.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xn.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xn.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xn.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xn.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xn.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xn.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xn.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/nRF5xn.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/projectconfig.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/projectconfig.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/projectconfig.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/projectconfig.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/supress-warnings.cmake b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/supress-warnings.cmake similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/supress-warnings.cmake rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF51/source/supress-warnings.cmake diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/CHANGELOG.md b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/CHANGELOG.md similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/CHANGELOG.md rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/CHANGELOG.md diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/LICENSE b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/LICENSE similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/LICENSE rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/LICENSE diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/apache-2.0.txt b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/apache-2.0.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/apache-2.0.txt rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/apache-2.0.txt diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/module.json b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/module.json similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/module.json rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/module.json diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/softdevice_nrf51822_licence_agreement.txt b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/softdevice_nrf51822_licence_agreement.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/softdevice_nrf51822_licence_agreement.txt rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/softdevice_nrf51822_licence_agreement.txt diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_clock.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_clock.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_clock.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_clock.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_gap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_gap.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_gap.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_gap.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_gap.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_gap.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_gap.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_gap.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_security.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_security.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_security.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_security.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_security.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_security.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_security.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_security.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_security_pm.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_security_pm.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle_security_pm.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/btle_security_pm.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/custom/custom_helper.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/custom/custom_helper.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/custom/custom_helper.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/custom/custom_helper.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/custom/custom_helper.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/custom/custom_helper.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/custom/custom_helper.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/btle/custom/custom_helper.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/ansi_escape.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/ansi_escape.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/ansi_escape.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/ansi_escape.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/assertion.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/assertion.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/assertion.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/assertion.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/binary.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/binary.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/binary.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/binary.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/ble_error.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/ble_error.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/ble_error.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/ble_error.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/common.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/common.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/common.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/common.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/compiler.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/compiler.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/common/compiler.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/common/compiler.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5XPalGattClient.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5XPalGattClient.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5XPalGattClient.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5XPalGattClient.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5XPalGattClient.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5XPalGattClient.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5XPalGattClient.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5XPalGattClient.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGap.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGap.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGap.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGattServer.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGattServer.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGattServer.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGattServer.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGattServer.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xGattServer.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGattServer.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xSecurityManager.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xSecurityManager.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xSecurityManager.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xSecurityManager.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xn.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xn.cpp similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xn.cpp rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xn.cpp diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xn.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xn.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xn.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xn.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/projectconfig.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/projectconfig.h similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/projectconfig.h rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/projectconfig.h diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/supress-warnings.cmake b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/supress-warnings.cmake similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/supress-warnings.cmake rename to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/supress-warnings.cmake diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/LF_Clock_config.md b/targets/TARGET_NORDIC/TARGET_NRF5/LF_Clock_config.md deleted file mode 100644 index 22852ae261a..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/LF_Clock_config.md +++ /dev/null @@ -1,97 +0,0 @@ - -# LF Clock configuration using mbed configuration system - -In order to provide the configuration for a low frequency (LF) clock, add a description of the LF clock inside a mbed configuration JSON file. -For example at application level the description might be added in a mbed_app.json file and on target level the description might be added in the hal/target.json file. -LF clock source configuration is used for MCU startup initialization and the BLE SoftDevice LF clock configuration (if BLE libraries is used). Advanced configurations are used only for the BLE SoftDevice LF clock configuration. - - -## Usage: - -1. Clock source - -Default clock source is XTAL oscillator. It is defined at the target level configuration as the target.lf_clock_src key. -There are three options that can be configured as the clock source: - - NRF_LF_SRC_XTAL - - NRF_LF_SRC_RC - - NRF_LF_SRC_SYNTH - -In order to override this configuration use targed_override section in configuration file (e.g mbed_app.json) - -```json -{ - "target_overrides": { - "*": { - "target.lf_clock_src": "NRF_LF_SRC_XTAL" - } - } -} -``` - -2a. Advanced configuration of the LFCLK RC oscillator: - -```json -{ - "config": { - "lf_clock_rc_calib_timer_interval": { - "value": 16, - "macro_name": "MBED_CONF_NORDIC_NRF_LF_CLOCK_CALIB_TIMER_INTERVAL" - }, - "lf_clock_rc_calib_mode_config": { - "value": 1, - "macro_name": "MBED_CONF_NORDIC_NRF_LF_CLOCK_CALIB_MODE_CONFIG" - } - } -} - -``` - -"lf_clock_rc_calib_timer_interval" - Calibration timer interval in 250 ms. It is equivalent to nrf_clock_lf_cfg_t::rc_ctiv. -This item generates macro MBED_CONF_NORDIC_NRF_LF_CLOCK_CALIB_TIMER_INTERVAL. -By default, such configuration is set to 16. - -"lf_clock_rc_calib_mode_config" - This value configures how often the RC oscillator will be calibrated, in number of calibration intervals. -It is equivalent to nrf_clock_lf_cfg_t::rc_temp_ctiv. -For further information, see the documentation for the [API of a SoftDevice 13x version 2.0.0](http://infocenter.nordicsemi.com/topic/com.nordic.infocenter.s132.api.v2.0.0/structnrf__clock__lf__cfg__t.html) -This item generates macro MBED_CONF_NORDIC_NRF_LF_CLOCK_CALIB_MODE_CONFIG. -By default, such configuration is set to 1. - -2b. Advanced configuration of the LFCLK XTAL oscillator: - -Accuracy of the clock source can be set. In order to do so macro MBED_CONF_NORDIC_LF_CLOCK_XTAL_ACCURACY should been provided (e.g. in mbed_app.json). -By default such configuration is set to NRF_CLOCK_LF_XTAL_ACCURACY_20_PPM. -For further information, see the documentation for the [API of a SoftDevice 13x version 2.0.0](https://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.s132.api.v2.0.0%2Fgroup___n_r_f___s_d_m___d_e_f_i_n_e_s.html) - -```json -{ - "config": { - "lf_clock_xtal_accuracy": { - "value": "NRF_CLOCK_LF_XTAL_ACCURACY_250_PPM", - "macro_name": "MBED_CONF_NORDIC_LF_CLOCK_XTAL_ACCURACY" - } - } -} - -``` - - - -2c. Advance configuration of the LFCLK Synthesized from HFCLK: - -Accuracy of the clock source can be set. In order to do so macro MBED_CONF_NORDIC_LF_CLOCK_SYNTH_ACCURACY should been provided (e.g. in mbed_app.json). -By default, such configuration is set to NRF_CLOCK_LF_XTAL_ACCURACY_20_PPM. -For further information, see the documentation for the [API of a SoftDevice 13x version 2.0.0](https://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.s132.api.v2.0.0%2Fgroup___n_r_f___s_d_m___d_e_f_i_n_e_s.html) - -```json -{ - "config": { - "lf_clock_synth_accuracy": { - "value": "NRF_CLOCK_LF_SYNTH_ACCURACY_250_PPM", - "macro_name": "MBED_CONF_NORDIC_LF_CLOCK_XTAL_ACCURACY" - } - } -} - -``` - - diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c deleted file mode 100644 index 5af6ab6dc11..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c +++ /dev/null @@ -1,265 +0,0 @@ -/* mbed Microcontroller Library - * Copyright (c) 2006-2013 ARM Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "mbed_assert.h" -#include "gpio_api.h" -#include "gpio_irq_api.h" -#include "pinmap.h" -#include "nrf_drv_gpiote.h" - - -#if defined(TARGET_MCU_NRF51822) - #define GPIO_PIN_COUNT 31 -#elif defined(TARGET_MCU_NRF52832) - #define GPIO_PIN_COUNT 32 -#elif defined(TARGET_MCU_NRF52840) - #define GPIO_PIN_COUNT 48 -#else - #error not recognized gpio count for mcu -#endif - -typedef struct { - bool used_as_gpio : 1; - PinDirection direction : 1; - PinMode pull : 2; - bool used_as_irq : 1; - bool irq_fall : 1; - bool irq_rise : 1; -} gpio_cfg_t; - -#if GPIO_PIN_COUNT > 32 - typedef uint64_t gpio_mask_t; -#else - typedef uint32_t gpio_mask_t; -#endif - -static gpio_mask_t m_gpio_initialized; -static gpio_cfg_t m_gpio_cfg[GPIO_PIN_COUNT]; - - -/*********** - GPIO IRQ -***********/ - -static gpio_irq_handler m_irq_handler; -static uint32_t m_channel_ids[GPIO_PIN_COUNT] = {0}; -static gpio_mask_t m_gpio_irq_enabled; - - -static void gpiote_irq_handler(nrf_drv_gpiote_pin_t pin, nrf_gpiote_polarity_t action) -{ - nrf_gpio_pin_sense_t sense = nrf_gpio_pin_sense_get(pin); - gpio_irq_event event = (sense == NRF_GPIO_PIN_SENSE_LOW) ? IRQ_RISE : IRQ_FALL; - - if (m_gpio_irq_enabled & ((gpio_mask_t)1 << pin)) { - if (((event == IRQ_RISE) && m_gpio_cfg[pin].irq_rise) - || ((event == IRQ_FALL) && m_gpio_cfg[pin].irq_fall)) { - m_irq_handler(m_channel_ids[pin], event); - } - } -} - -void GPIOTE_IRQHandler(void);// exported from nrf_drv_gpiote.c - -void gpio_init(gpio_t *obj, PinName pin) -{ - obj->pin = pin; - if (pin == (PinName)NC) { - return; - } - MBED_ASSERT((uint32_t)pin < GPIO_PIN_COUNT); - - NVIC_SetVector(GPIOTE_IRQn, (uint32_t) GPIOTE_IRQHandler); - - (void) nrf_drv_gpiote_init(); - - m_gpio_cfg[obj->pin].used_as_gpio = true; -} - -#ifdef TARGET_SDK11 -// implement polyfill of gpio hal for the nRF5 SDK v11 -__STATIC_INLINE uint32_t nrf_gpio_pin_out_read(uint32_t pin) -{ - return (NRF_GPIO->OUTSET & (1UL << (pin))); -} -#endif - -int gpio_read(gpio_t *obj) -{ - MBED_ASSERT(obj->pin != (PinName)NC); - if (m_gpio_cfg[obj->pin].direction == PIN_OUTPUT) { - return (nrf_gpio_pin_out_read(obj->pin) ? 1 : 0); - } else { - return nrf_gpio_pin_read(obj->pin); - } -} - -static void gpiote_pin_uninit(uint8_t pin) -{ - if (m_gpio_initialized & ((gpio_mask_t)1UL << pin)) { - if ((m_gpio_cfg[pin].direction == PIN_OUTPUT) && (!m_gpio_cfg[pin].used_as_irq)) { - nrf_drv_gpiote_out_uninit(pin); - } - else if (m_gpio_cfg[pin].used_as_irq) { - nrf_drv_gpiote_in_uninit(pin); - } - } -} - -static void gpio_apply_config(uint8_t pin) -{ - if (m_gpio_cfg[pin].used_as_gpio || m_gpio_cfg[pin].used_as_irq) { - if ((m_gpio_cfg[pin].direction == PIN_INPUT) - || (m_gpio_cfg[pin].used_as_irq)) { - //Configure as input. - nrf_drv_gpiote_in_config_t cfg; - - cfg.hi_accuracy = false; - cfg.is_watcher = false; - cfg.sense = NRF_GPIOTE_POLARITY_TOGGLE; - if (m_gpio_cfg[pin].used_as_irq) { - cfg.pull = NRF_GPIO_PIN_PULLUP; - nrf_drv_gpiote_in_init(pin, &cfg, gpiote_irq_handler); - if ((m_gpio_irq_enabled & ((gpio_mask_t)1 << pin)) - && (m_gpio_cfg[pin].irq_rise || m_gpio_cfg[pin].irq_fall)) - { - nrf_drv_gpiote_in_event_enable(pin, true); - } - } - else { - switch(m_gpio_cfg[pin].pull) { - case PullUp: - cfg.pull = NRF_GPIO_PIN_PULLUP; - break; - case PullDown: - cfg.pull = NRF_GPIO_PIN_PULLDOWN; - break; - default: - cfg.pull = NRF_GPIO_PIN_NOPULL; - break; - } - nrf_gpio_cfg_input(pin,cfg.pull); - } - } - else { - // Configure as output. - nrf_drv_gpiote_out_config_t cfg = GPIOTE_CONFIG_OUT_SIMPLE(nrf_gpio_pin_out_read(pin)); - nrf_drv_gpiote_out_init(pin, &cfg); - } - m_gpio_initialized |= ((gpio_mask_t)1UL << pin); - } - else { - m_gpio_initialized &= ~((gpio_mask_t)1UL << pin); - } -} - - -void gpio_mode(gpio_t *obj, PinMode mode) -{ - MBED_ASSERT(obj->pin != (PinName)NC); - - gpiote_pin_uninit(obj->pin); // try to uninitialize gpio before a change. - - m_gpio_cfg[obj->pin].pull = mode; - gpio_apply_config(obj->pin); -} - - -void gpio_dir(gpio_t *obj, PinDirection direction) -{ - MBED_ASSERT(obj->pin != (PinName)NC); - - gpiote_pin_uninit(obj->pin); // try to uninitialize gpio before a change. - - m_gpio_cfg[obj->pin].direction = direction; - gpio_apply_config(obj->pin); -} - - -/*********** - GPIO IRQ -***********/ - -int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id) -{ - if (pin == NC) { - return -1; - } - MBED_ASSERT((uint32_t)pin < GPIO_PIN_COUNT); - (void) nrf_drv_gpiote_init(); - - gpiote_pin_uninit(pin); // try to uninitialize gpio before a change. - - m_gpio_cfg[pin].used_as_irq = true; - m_channel_ids[pin] = id; - obj->ch = pin; - m_irq_handler = handler; - m_channel_ids[pin] = id; - - gpio_apply_config(pin); - return 1; -} - - -void gpio_irq_free(gpio_irq_t *obj) -{ - nrf_drv_gpiote_in_uninit(obj->ch); - m_gpio_cfg[obj->ch].used_as_irq = false; - m_channel_ids[obj->ch] = 0; - - gpio_apply_config(obj->ch); -} - - -void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) -{ - gpio_cfg_t* cfg = &m_gpio_cfg[obj->ch]; - bool irq_enabled_before = - (m_gpio_irq_enabled & ((gpio_mask_t)1 << obj->ch)) && - (cfg->irq_rise || cfg->irq_fall); - - if (event == IRQ_RISE) { - cfg->irq_rise = enable ? true : false; - } - else if (event == IRQ_FALL) { - cfg->irq_fall = enable ? true : false; - } - - bool irq_enabled_after = cfg->irq_rise || cfg->irq_fall; - - if (irq_enabled_before != irq_enabled_after) { - if (irq_enabled_after) { - gpio_irq_enable(obj); - } else { - gpio_irq_disable(obj); - } - } -} - - -void gpio_irq_enable(gpio_irq_t *obj) -{ - m_gpio_irq_enabled |= ((gpio_mask_t)1 << obj->ch); - if (m_gpio_cfg[obj->ch].irq_rise || m_gpio_cfg[obj->ch].irq_fall) { - nrf_drv_gpiote_in_event_enable(obj->ch, true); - } -} - - -void gpio_irq_disable(gpio_irq_t *obj) -{ - m_gpio_irq_enabled &= ~((gpio_mask_t)1 << obj->ch); - nrf_drv_gpiote_in_event_disable(obj->ch); -} diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/gpio_object.h b/targets/TARGET_NORDIC/TARGET_NRF5/gpio_object.h deleted file mode 100644 index f7b621a9ed0..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/gpio_object.h +++ /dev/null @@ -1,48 +0,0 @@ -/* mbed Microcontroller Library - * Copyright (c) 2006-2013 ARM Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef MBED_GPIO_OBJECT_H -#define MBED_GPIO_OBJECT_H - -#include "mbed_assert.h" - -#include "nrf_gpio.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PinName pin; -} gpio_t; - -static inline void gpio_write(gpio_t *obj, int value) { - MBED_ASSERT(obj->pin != (PinName)NC); - if (value) { - nrf_gpio_pin_set(obj->pin); - } else { - nrf_gpio_pin_clear(obj->pin); - } -} - -static inline int gpio_is_connected(const gpio_t *obj) { - return obj->pin != (PinName)NC; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/nrf5x_lf_clk_helper.h b/targets/TARGET_NORDIC/TARGET_NRF5/nrf5x_lf_clk_helper.h deleted file mode 100644 index 08744be767f..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/nrf5x_lf_clk_helper.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2016 Nordic Semiconductor ASA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA - * integrated circuit in a product or a software update for such product, must reproduce - * the above copyright notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be - * used to endorse or promote products derived from this software without specific prior - * written permission. - * - * 4. This software, with or without modification, must only be used with a - * Nordic Semiconductor ASA integrated circuit. - * - * 5. Any software provided in binary or object form under this license must not be reverse - * engineered, decompiled, modified and/or disassembled. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef __NRF5X_LF_CLK_HELPER_H_ - -#ifndef MBED_CONF_NORDIC_NRF_LF_CLOCK_SRC - #define MBED_CONF_NORDIC_NRF_LF_CLOCK_SRC (NRF_LF_SRC_XTAL) - #warning No configuration for LF clock source. Xtal source will be used as a default configuration. -#endif - - - -#define NRF_LF_SRC_XTAL 2 -#define NRF_LF_SRC_SYNTH 3 -#define NRF_LF_SRC_RC 4 - -#if MBED_CONF_NORDIC_NRF_LF_CLOCK_SRC == NRF_LF_SRC_SYNTH - #define CLOCK_LFCLKSRC_SRC_TO_USE (CLOCK_LFCLKSRC_SRC_Synth) -#elif MBED_CONF_NORDIC_NRF_LF_CLOCK_SRC == NRF_LF_SRC_XTAL - #define CLOCK_LFCLKSRC_SRC_TO_USE (CLOCK_LFCLKSRC_SRC_Xtal) -#elif MBED_CONF_NORDIC_NRF_LF_CLOCK_SRC == NRF_LF_SRC_RC - #define CLOCK_LFCLKSRC_SRC_TO_USE (CLOCK_LFCLKSRC_SRC_RC) -#else - #error Bad LFCLK configuration. Declare proper source through mbed configuration. -#endif - -#undef NRF_LF_SRC_XTAL -#undef NRF_LF_SRC_SYNTH -#undef NRF_LF_SRC_RC - -#endif diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/pinmap.c b/targets/TARGET_NORDIC/TARGET_NRF5/pinmap.c deleted file mode 100644 index f723a5837e1..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/pinmap.c +++ /dev/null @@ -1,41 +0,0 @@ -/* mbed Microcontroller Library - * Copyright (c) 2006-2013 ARM Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "mbed_assert.h" -#include "mbed_error.h" -#include "pinmap.h" -#include "nrf_gpio.h" - -void pin_function(PinName pin, int function) -{ - /* Avoid compiler warnings */ - (void) pin; - (void) function; -} - -void pin_mode(PinName pin, PinMode mode) -{ - MBED_ASSERT(pin != (PinName)NC); - - uint32_t pin_number = (uint32_t)pin; - -#ifdef TARGET_SDK11 - NRF_GPIO_Type * reg = NRF_GPIO; -#else - NRF_GPIO_Type * reg = nrf_gpio_pin_port_decode(&pin_number); -#endif - reg->PIN_CNF[pin_number] &= ~GPIO_PIN_CNF_PULL_Msk; - reg->PIN_CNF[pin_number] |= (mode << GPIO_PIN_CNF_PULL_Pos); -} diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/port_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/port_api.c deleted file mode 100644 index e8c57184a5a..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/port_api.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2013 Nordic Semiconductor ASA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA - * integrated circuit in a product or a software update for such product, must reproduce - * the above copyright notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be - * used to endorse or promote products derived from this software without specific prior - * written permission. - * - * 4. This software, with or without modification, must only be used with a - * Nordic Semiconductor ASA integrated circuit. - * - * 5. Any software provided in binary or object form under this license must not be reverse - * engineered, decompiled, modified and/or disassembled. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include "port_api.h" -#include "pinmap.h" - -#if defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832) - #define GPIO_REG_LIST {NRF_GPIO} -#endif - -static NRF_GPIO_Type * const m_ports[] = GPIO_REG_LIST; - -#if defined(TARGET_MCU_NRF51822) - static const uint32_t m_gpio_pin_count[] = {31}; -#elif defined(TARGET_MCU_NRF52832) - static const uint32_t m_gpio_pin_count[] = {32}; -#elif defined(TARGET_MCU_NRF52840) - static const uint32_t m_gpio_pin_count[] = {32, 16}; -#else - #error not recognized gpio count for mcu -#endif - -#define GPIO_PORT_COUNT (sizeof(m_gpio_pin_count)/sizeof(m_gpio_pin_count[0])) - - -PinName port_pin(PortName port, int pin_n) -{ -#if defined(TARGET_MCU_NRF51822) || defined(TARGET_MCU_NRF52832) - return (PinName)pin_n; -#else - return (PinName)NRF_GPIO_PIN_MAP(port, pin_n); -#endif -} - -void port_init(port_t *obj, PortName port, int mask, PinDirection dir) -{ - MBED_ASSERT((uint32_t)port < GPIO_PORT_COUNT); - - obj->port = port; - obj->mask = mask; - - port_dir(obj, dir); -} - -void port_mode(port_t *obj, PinMode mode) -{ - uint32_t i; - // The mode is set per pin: reuse pinmap logic - for (i = 0; i<31; i++) { - if (obj->mask & (1 << i)) { - pin_mode(port_pin(obj->port, i), mode); - } - } -} - -void port_dir(port_t *obj, PinDirection dir) -{ - uint32_t i; - - volatile uint32_t *reg_cnf = (volatile uint32_t*) m_ports[obj->port]->PIN_CNF; - - switch (dir) { - case PIN_INPUT: - - for (i = 0; i < m_gpio_pin_count[obj->port]; i++) { - if (obj->mask & (1 << i)) { - reg_cnf[i] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) - | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) - | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) - | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos); - } - } - break; - - case PIN_OUTPUT: - - for (i = 0; i < m_gpio_pin_count[obj->port]; i++) { - if (obj->mask & (1 << i)) { - reg_cnf[i] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos) - | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos) - | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) - | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) - | (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos); - } - } - break; - } -} - -void port_write(port_t *obj, int value) -{ - m_ports[obj->port]->OUTSET = value & obj->mask; - m_ports[obj->port]->OUTCLR = (~value) & obj->mask; -} - -int port_read(port_t *obj) -{ - return ((m_ports[obj->port]->IN) & obj->mask); -} diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/copyright_header.txt b/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/copyright_header.txt deleted file mode 100644 index d7e5224ea7c..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/copyright_header.txt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) Nordic Semiconductor ASA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA - * integrated circuit in a product or a software update for such product, must reproduce - * the above copyright notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be - * used to endorse or promote products derived from this software without specific prior - * written permission. - * - * 4. This software, with or without modification, must only be used with a - * Nordic Semiconductor ASA integrated circuit. - * - * 5. Any software provided in binary or object form under this license must not be reverse - * engineered, decompiled, modified and/or disassembled. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ \ No newline at end of file diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/replace_headers.py b/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/replace_headers.py deleted file mode 100644 index 1c985f63355..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/replace_headers.py +++ /dev/null @@ -1,48 +0,0 @@ -import os -import re - - - - -def replace_header(in_path): - with open("copyright_header.txt", "r") as fd: - header = fd.read() - - for root, dirs, files in os.walk(in_path): - for fn in [os.path.join(root, x) for x in files]: - with open(fn, "r+") as fd: - #print fn - s = fd.read() - start = s.find("/*") - end = s.find("*/") - copyright_str = s[start:end+2] - if ("copyright (c)" in copyright_str.lower()) and ("nordic semiconductor" in copyright_str.lower()): - - - pat_reg = r"copyright \(c\)[\s]{1,5}([0-9]{4})" - find_obj = re.search(pat_reg, copyright_str.lower()) - - if find_obj == None: - header_year = re.sub(r'()',"2000",header) - print "default date>>" + fn - else: - header_year = re.sub(r'()',find_obj.group(1),header) - - s = s.replace(copyright_str, header_year) - - #print(header_year) - - fd.seek(0) - fd.write(s) - fd.truncate() - - ##print "+"*35 - print fn - - -pathes = ["..\\sdk", - "..\\TARGET_MCU_NRF52832\\sdk", - "..\\TARGET_MCU_NRF52840\\sdk"] - -for path in pathes: - replace_header(path) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/sdk_update.py b/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/sdk_update.py deleted file mode 100644 index 752afaa2a41..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/sdk_update.py +++ /dev/null @@ -1,277 +0,0 @@ -#!python3 -import os, shutil, json, pprint, sys, string, json, argparse -from collections import OrderedDict -from shutil import copyfile, copytree - -def rename_sdk_old_dirs(path, dry_run = False): - # I make assumption that all old sdk dirs have "sdk" names. - sdk_dir_name = "sdk" - path = "." - - for root, dirs, files in os.walk(path): - for name in dirs: - if name == "sdk": - full_path = root + "\\" + name - new_full_path = root + "\\_old_" + name - print("rename " + full_path + " ---> " + new_full_path) - if not dry_run: - os.rename(full_path, new_full_path) - os.mkdir(full_path) - -def rename_dirs(sdk_dirs_in_mbed, new_name, dry_run=False): - - for dir_path in sdk_dirs_in_mbed: - xdir_path = os.path.join('.',dir_path) - new_dir_path = os.path.join(os.path.dirname(xdir_path), new_name) - print("rename " + xdir_path + " ---> " + new_dir_path) - if not dry_run: - os.rename(xdir_path, new_dir_path) - -def get_file_pathes_couples(path_sdk_componets, skip_dirs = [], skip_files = [], verbose = False): - mbed_list = [] - cutted_roots = [] - cutted_files = [] - - path_sdk_componets = path_sdk_componets + '\\' - - for root, dirs, files in os.walk(path_sdk_componets): - procced = True - cutted_root = root[len(path_sdk_componets):] - - for skip_d in skip_dirs: - if 0 == string.find(cutted_root, skip_d): - cutted_roots.append(cutted_root) - procced = False - - if procced: - for file_name in files: - - procced = True - for skip_f in skip_files: - if (-1) != string.find(file_name, skip_f): - cutted_files.append(file_name) - procced = False - - if procced: - if file_name.endswith((".c", ".h")): - #cutted_path = cutted_root + "\\" + file_name - cutted_path = os.path.join(cutted_root, file_name) - #full_path = root + "\\" + file_name - full_path = os.path.join(root, file_name) - item = {"full_path": full_path, "id": cutted_path, "cutted_root": cutted_root} - #mbed_list.append([full_path, cutted_path]) - mbed_list.append(item) - - if verbose: - print("\r\nskipped directories: {0:#d}".format(len(cutted_roots))) - - for xitem in cutted_roots: - print(xitem) - - print("\r\nskipped files: {0:#d}".format(len(cutted_files))) - - for kitem in cutted_files: - print(kitem) - - return mbed_list - -def apply_replacement_id(mbed_list, replacemet_couples): - for item in mbed_list: - splited = os.path.split(item["id"]) - result = string.find(splited[1], replacemet_couples["old"]) - if result != -1: - new_tail = replacemet_couples["new"] + splited[1][len(replacemet_couples["old"]):] - item["id"] = os.path.join(splited[0],new_tail) - #print('bingo!') - #print(item) - - return mbed_list - - -def get_copying_automatic_list(list_mbed, list_sdk, mbed_port_path = '', verbose = False): - copy_list = [] #list of copy items - orphan_list = [] - - licz = 0 - for pathes_mbed in list_mbed: - empty = True - for pathes_sdk in list_sdk: - if pathes_mbed["id"] == pathes_sdk["id"]: - dest_path = pathes_mbed["full_path"] - - dest_path = dest_path[ (len(mbed_port_path)):] - - item = {"id" : pathes_mbed["id"], "src_path": pathes_sdk["full_path"], "dest_path": dest_path, "old_path": pathes_mbed["full_path"]} - copy_list.append(item) - - empty = False; - - - if empty: - orphan_list.append(pathes_mbed["full_path"]) - - print("\r\nfitted files: {0:#d}".format(len(copy_list))) - - if verbose: - for item in copy_list: - str_verbose = "{0} --> {1}" - print(str_verbose.format(item["id"], item["dest_path"])) - - - print("\r\norphaned files: {0:#d}".format(len(orphan_list))) - - if verbose: - for xitem in orphan_list: - print(xitem) - - return copy_list - -def is_in_copying_list(copy_list, file_id): - for pathes_copy in copy_list: - if pathes_copy["id"] == file_id: - - return False - - return True - - -def upgrade_copying_list(copy_list, pathes_sdk, dest_mbed_dir_path, print_list): - splited = os.path.split(pathes_sdk["id"]) - dest_path = os.path.join(dest_mbed_dir_path, splited[1]) - item = {"id" : pathes_sdk["id"], "src_path": pathes_sdk["full_path"], "dest_path": dest_path} #, "old_path": pathes_mbed["full_path"]} - copy_list.append(item) - print_list.append(item) - - - - -def upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, port_relative_dir = '',verbose = False): - print_list = [] - - for pathes_sdk in list_sdk: - if is_in_copying_list(copy_list, pathes_sdk["id"]): - - make_hard_copy = False - - for hard_copy_dir in force_copy_dirs_list: - - if 0 == string.find(pathes_sdk["cutted_root"], hard_copy_dir["sdk_dir"]): - - make_hard_copy = True - - post_path = os.path.relpath(pathes_sdk["cutted_root"], hard_copy_dir["sdk_dir"]) - - if post_path == '.': - corect_hard_copy_dir = hard_copy_dir["mbed_dir"] - if post_path != '.': # destynation is a nested directory - corect_hard_copy_dir = os.path.join(hard_copy_dir["mbed_dir"], post_path) - - corect_hard_copy_dir = os.path.join(port_relative_dir, corect_hard_copy_dir) - - upgrade_copying_list(copy_list, pathes_sdk, corect_hard_copy_dir, print_list) - break - - - print("\r\nforced copy of files by directories: {0:#d}".format(len(print_list))) - - if verbose: - for item in print_list: - str_verbose = "{0} --> {1}" - print(str_verbose.format(item["id"], item["dest_path"])) - -def upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, port_relative_dir ='',verbose = False): - print_list = [] - - for pathes_sdk in list_sdk: - if is_in_copying_list(copy_list, pathes_sdk["id"]): - - make_hard_copy = False - - for hard_copy_file in force_copy_files_list: - if pathes_sdk["id"] == hard_copy_file["sdk_file"]: - make_hard_copy = True - - corect_hard_copy_dir = os.path.join(port_relative_dir, hard_copy_file["mbed_dir"]) - - upgrade_copying_list(copy_list, pathes_sdk, corect_hard_copy_dir, print_list) - break - - print("\r\nforced copy of files by files: {0:#d}".format(len(print_list))) - - if verbose: - for item in print_list: - str_verbose = "{0} --> {1}" - print(str_verbose.format(item["id"], item["dest_path"])) - -def copy_one_file(src, dest, verbose=False,dry_run=False): - dirs_to_created = os.path.dirname(dest) - - if not os.path.exists(dirs_to_created): - if not dry_run: - os.makedirs(dirs_to_created) - - if verbose: - print('makerdirs: {0}'.format(dirs_to_created)) - - if not dry_run: - shutil.copyfile(src, dest) - - if verbose: - print('copy: {0} --> {1}'.format(src, dest)) - - - -if __name__ == '__main__': - argument_parser = argparse.ArgumentParser() - argument_parser.add_argument('-r', '--run', help='run', action='store_true') - argument_parser.add_argument('-v', '--verbose', help='Verbose mode', action='store_true') - #argument_parser.add_argument('-r', '--rename_only', help='rename only', action='store_true') - - parser_args = vars(argument_parser.parse_args()) - - verbose = False - - if parser_args['verbose'] or not parser_args['run']: - verbose = True - - with open('update_desc.json') as data_file: - update_desc = json.load(data_file) - - - #if not parser_args ['rename_only']: - ignore_file_list = update_desc['ignore_file_list'] - ignore_dirs_list = update_desc['ignore_dirs_list'] - id_replacements = update_desc['id_replacements'] - force_copy_files_list = update_desc['force_copy_files_list'] - force_copy_dirs_list = update_desc['force_copy_dirs_list'] - sdk_dirs_in_mbed = update_desc['sdk_dirs_in_mbed'] - sdk_component_path = update_desc['sdk_component_path'] - port_relative_dir = update_desc['port_relative_dir_in_mbed'] - - list_sdk = get_file_pathes_couples(sdk_component_path, - ignore_dirs_list, - ignore_file_list, - verbose) - list_mbed = [] - for directory in sdk_dirs_in_mbed: - list_mbed.extend(get_file_pathes_couples(directory)) - - list_mbed = apply_replacement_id(list_mbed, id_replacements) - - mbed_port_path = '' - - copy_list = get_copying_automatic_list(list_mbed, list_sdk, mbed_port_path, verbose) - - upgrade_copying_list_by_dirs(copy_list, list_sdk, force_copy_dirs_list, port_relative_dir, verbose) - upgrade_copying_list_by_files(copy_list, list_sdk, force_copy_files_list, port_relative_dir, verbose) - - rename_dirs(sdk_dirs_in_mbed, '_old_sdk', not parser_args['run']) - - for copy_item in copy_list: - src = os.path.join('.',copy_item["src_path"]) - dest = os.path.join('.',copy_item["dest_path"]) - - copy_one_file(src, dest, verbose, not parser_args['run']) - - with open('sdk_update_result.json', 'w') as fp: - json.dump(copy_list, fp) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/update_desc.json b/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/update_desc.json deleted file mode 100644 index abbb58c4bb5..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/porting_tools/update_desc.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "id_replacements" : {"old": "nrf_ble", "new": "ble"}, - "ignore_dirs_list" : [ "ant", - "nfc", - "proprietary_rf", - "serialization", - "toolchain", - "ble\\ble_services\\ble_ancs_c", - "ble\\ble_services\\ble_ans_c", - "ble\\ble_services\\ble_bas", - "ble\\ble_services\\ble_bas_c", - "ble\\ble_services\\ble_bps", - "ble\\ble_services\\ble_cscs", - "ble\\ble_services\\ble_cts_c", - "ble\\ble_services\\ble_dis", - "ble\\ble_services\\ble_escs", - "ble\\ble_services\\ble_gls", - "ble\\ble_services\\ble_hids", - "ble\\ble_services\\ble_hrs", - "ble\\ble_services\\ble_hrs_c", - "ble\\ble_services\\ble_hts", - "ble\\ble_services\\ble_ias", - "ble\\ble_services\\ble_ias_c", - "ble\\ble_services\\ble_lbs", - "ble\\ble_services\\ble_lbs_c", - "ble\\ble_services\\ble_lls", - "ble\\ble_services\\ble_nus", - "ble\\ble_services\\ble_nus_c", - "ble\\ble_services\\ble_rscs", - "ble\\ble_services\\ble_rscs_c", - "ble\\ble_services\\ble_tps", - "ble\\ble_services\\experimental_ble_lns", - "ble\\ble_services\\experimental_nrf_ble_bms", - "ble\\ble_services\\experimental_nrf_ble_cgms", - "drivers_ext", - "softdevice\\s212", - "softdevice\\s332", - "ble\\nrf_ble_qwr", - "libraries\\button", - "libraries\\crc32", - "libraries\\crypto", - "libraries\\csense", - "libraries\\ecc", - "libraries\\fifo", - "libraries\\gpiote", - "libraries\\hardfault", - "libraries\\ic_info", - "libraries\\led_softblink", - "libraries\\low_power_pwm", - "libraries\\mailbox", - "libraries\\mem_manager", - "libraries\\sensorsim", - "libraries\\sha256", - "libraries\\simple_timer", - "libraries\\slip", - "libraries\\timer", - "libraries\\twi", - "libraries\\uart", - "drivers_nrf\\twi_master\\deprecated" - ], - - "ignore_file_list": [ - "dox_config.h", - "ble_error_log.c", - "ble_conn_params.c", - "app_error_weak_cmock.c", - "hci_slip.c", - "hci_slip.h", - "hci_transport.c", - "hci_transport.h", - "spi_5W_master.c", - "spi_5W_master.h", - "app_scheduler_serconn.c" - ], - - "force_copy_files_list" : [{"sdk_file": "sdk_validation.h", "mbed_dir": "sdk"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_comp.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_egu.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_i2s.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_lpcomp.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_peripherals.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_qdec.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_rng.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_twim.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_twis.h", "mbed_dir": "sdk\\drivers_nrf\\hal"}, - {"sdk_file": "drivers_nrf\\hal\\nrf_uarte.h", "mbed_dir": "sdk\\drivers_nrf\\hal"} - ], - - "force_copy_dirs_list" : [{"sdk_dir": "device", "mbed_dir": "sdk\\device"}, - {"sdk_dir": "ble\\ble_dtm", "mbed_dir": "sdk\\ble\\ble_dtm"}, - {"sdk_dir": "drivers_nrf\\comp", "mbed_dir": "sdk\\drivers_nrf\\comp"}, - {"sdk_dir": "drivers_nrf\\i2s", "mbed_dir": "sdk\\drivers_nrf\\i2s"}, - {"sdk_dir": "drivers_nrf\\lpcomp", "mbed_dir": "sdk\\drivers_nrf\\lpcomp"}, - {"sdk_dir": "drivers_nrf\\nrf_soc_nosd", "mbed_dir": "sdk\\drivers_nrf\\nrf_soc_nosd"}, - {"sdk_dir": "drivers_nrf\\pdm", "mbed_dir": "sdk\\drivers_nrf\\pdm"}, - {"sdk_dir": "drivers_nrf\\qdec", "mbed_dir": "sdk\\drivers_nrf\\qdec"}, - {"sdk_dir": "drivers_nrf\\radio_config", "mbed_dir": "sdk\\drivers_nrf\\radio_config"}, - {"sdk_dir": "drivers_nrf\\rng", "mbed_dir": "sdk\\drivers_nrf\\rng"}, - {"sdk_dir": "drivers_nrf\\rtc", "mbed_dir": "sdk\\drivers_nrf\\rtc"}, - {"sdk_dir": "drivers_nrf\\sdio", "mbed_dir": "sdk\\drivers_nrf\\sdio"}, - {"sdk_dir": "drivers_nrf\\swi", "mbed_dir": "sdk\\drivers_nrf\\swi"}, - {"sdk_dir": "drivers_nrf\\twis_slave", "mbed_dir": "sdk\\drivers_nrf\\twis_slave"}, - {"sdk_dir": "drivers_nrf\\uart", "mbed_dir": "sdk\\drivers_nrf\\uart"}, - {"sdk_dir": "drivers_nrf\\wdt", "mbed_dir": "sdk\\drivers_nrf\\wdt"}, - {"sdk_dir": "libraries\\log", "mbed_dir": "sdk\\libraries\\log"}, - {"sdk_dir": "libraries\\bootloader", "mbed_dir": "sdk\\libraries\\bootloader"}, - {"sdk_dir": "libraries\\svc", "mbed_dir": "sdk\\libraries\\svc"}, - {"sdk_dir": "ble\\ble_services\\ble_dfu", "mbed_dir": "ble\\ble_services\\ble_dfu"}, - {"sdk_dir": "libraries\\bootloader", "mbed_dir": "libraries\\bootloader"}, - {"sdk_dir": "softdevice\\s140", "mbed_dir": "TARGET_MCU_NRF52840\\sdk\\softdevice\\s140"}, - {"sdk_dir": "softdevice\\s140\\nrf52", "mbed_dir": "TARGET_MCU_NRF52840\\sdk\\softdevice\\s140\\nrf52"} - ], - - "sdk_dirs_in_mbed" : [ - "..\\sdk", - "..\\TARGET_MCU_NRF52832\\sdk" - ], - - "port_relative_dir_in_mbed" : "..", - - "sdk_component_path": "C:\\nRF5_SDK_13.0.0-1.alpha_055eef3\\components" -} \ No newline at end of file diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/rtc_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/rtc_api.c deleted file mode 100644 index cc4d0f118f9..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5/rtc_api.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2013 Nordic Semiconductor ASA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA - * integrated circuit in a product or a software update for such product, must reproduce - * the above copyright notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be - * used to endorse or promote products derived from this software without specific prior - * written permission. - * - * 4. This software, with or without modification, must only be used with a - * Nordic Semiconductor ASA integrated circuit. - * - * 5. Any software provided in binary or object form under this license must not be reverse - * engineered, decompiled, modified and/or disassembled. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include "rtc_api.h" - -#if DEVICE_RTC - -#include "common_rtc.h" -#include "nrf_drv_clock.h" -#include "app_util_platform.h" - -static time_t m_time_base; - -void rtc_init(void) -{ - common_rtc_init(); -} - -void rtc_free(void) -{ - // A common counter is used for RTC, lp_ticker and us_ticker, so it can't be - // disabled here, but this does not cause any extra cost. Besides, currently - // this function is not used by RTC API in mbed-drivers. -} - -int rtc_isenabled(void) -{ - return m_common_rtc_enabled; -} - -static uint32_t rtc_seconds_get(void) -{ - // Convert current counter value to seconds. - uint32_t seconds = nrf_rtc_counter_get(COMMON_RTC_INSTANCE) / RTC_INPUT_FREQ; - // Add proper amount of seconds for each registered overflow of the counter. - uint32_t seconds_per_overflow = (1uL << RTC_COUNTER_BITS) / RTC_INPUT_FREQ; - return (seconds + (m_common_rtc_overflows * seconds_per_overflow)); -} - -time_t rtc_read(void) -{ - return m_time_base + rtc_seconds_get(); -} - -void rtc_write(time_t t) -{ - uint32_t seconds; - do { - seconds = rtc_seconds_get(); - m_time_base = t - seconds; - // If the number of seconds indicated by the counter changed during the - // update of the time base, just repeat the update, now using the new - // number of seconds. - } while (seconds != rtc_seconds_get()); -} - -#endif // DEVICE_RTC diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/PeripheralNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/PeripheralNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/PeripheralNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/PeripheralNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/PortNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/PortNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/PortNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/PortNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/PinNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/PinNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/device.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/device.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/device.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/mbed_overrides.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/mbed_overrides.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/mbed_overrides.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_DELTA_DFCM_NNN50/mbed_overrides.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/PinNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/PinNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/device.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/device.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/device.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_MTB_LAIRD_BL600/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/PinNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/PinNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/device.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/device.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/device.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DK/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/PinNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/PinNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/device.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/device.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/device.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_NRF51_DONGLE/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/PinNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/PinNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/device.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/device.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/device.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_OSHCHIP/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/PinNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/PinNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/device.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/device.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/device.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_TY51822R3/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/PinNames.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/PinNames.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/PinNames.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/PinNames.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/device.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/device.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/device.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/TARGET_VBLUNO51/device.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/analogin_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/analogin_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/analogin_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/analogin_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_16K/startup_nRF51822.S b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_16K/startup_nRF51822.S similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_16K/startup_nRF51822.S rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_16K/startup_nRF51822.S diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/nRF51822.sct diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/startup_nRF51822.S b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/startup_nRF51822.S similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/startup_nRF51822.S rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NORDIC_32K/startup_nRF51822.S diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S110/nRF51822.sct b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S110/nRF51822.sct similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S110/nRF51822.sct rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S110/nRF51822.sct diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S130/nRF51822.sct b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S130/nRF51822.sct similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S130/nRF51822.sct rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_ARM_STD/TARGET_MCU_NRF51_16K_S130/nRF51822.sct diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NORDIC_32K/NRF51822.ld diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S110/NRF51822.ld b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S110/NRF51822.ld similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S110/NRF51822.ld rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S110/NRF51822.ld diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S130/NRF51822.ld b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S130/NRF51822.ld similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S130/NRF51822.ld rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/TARGET_MCU_NRF51_16K_S130/NRF51822.ld diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/startup_NRF51822.S b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/startup_NRF51822.S similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/startup_NRF51822.S rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_GCC_ARM/startup_NRF51822.S diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_16K/nRF51822_QFAA.icf b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_16K/nRF51822_QFAA.icf similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_16K/nRF51822_QFAA.icf rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_16K/nRF51822_QFAA.icf diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/TARGET_MCU_NORDIC_32K/nRF51822_QFAA.icf diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/startup_NRF51822_IAR.S b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/startup_NRF51822_IAR.S similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/startup_NRF51822_IAR.S rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/TOOLCHAIN_IAR/startup_NRF51822_IAR.S diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/cmsis.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/cmsis.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/cmsis.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/cmsis.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/cmsis_nvic.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/device/system_nrf51.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/pwmout_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/pwmout_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/pwmout_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/pwmout_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/drivers_nrf/adc/nrf_drv_adc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/nrf_drv_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/nrf_drv_config.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/nrf_drv_config.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/nrf_drv_config.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf51/nrf_mbr.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf51/nrf_mbr.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf51/nrf_mbr.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf51/nrf_mbr.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_err.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_err.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_err.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_err.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gap.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gap.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gap.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gap.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatt.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatt.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatt.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatt.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gattc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gattc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gattc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gattc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatts.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatts.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatts.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_gatts.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_hci.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_hci.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_hci.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_hci.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_l2cap.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_l2cap.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_l2cap.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_l2cap.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_ranges.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_ranges.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_ranges.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_ranges.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_types.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_types.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_types.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_ble_types.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_sdm.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_sdm.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_sdm.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_sdm.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_soc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_soc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_soc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_error_soc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_nvic.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_nvic.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_nvic.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_nvic.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sd_def.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sd_def.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sd_def.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sd_def.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sdm.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sdm.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sdm.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_sdm.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_soc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_soc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_soc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_soc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_svc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_svc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_svc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/headers/nrf_svc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/hex/s130_nrf51_2.0.0_softdevice.hex b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/hex/s130_nrf51_2.0.0_softdevice.hex similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/hex/s130_nrf51_2.0.0_softdevice.hex rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk/softdevice/s130/hex/s130_nrf51_2.0.0_softdevice.hex diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk_patch/sdk_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk_patch/sdk_config.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822_UNIFIED/sdk_patch/sdk_config.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/sdk_patch/sdk_config.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/common_rtc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/common_rtc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/common_rtc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/common_rtc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/flash_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/flash_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/i2c_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/i2c_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/i2c_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/i2c_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/irq_handlers_hw.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/irq_handlers_hw.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/irq_handlers_hw.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/irq_handlers_hw.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/itm_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/itm_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/itm_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/itm_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/lp_ticker.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/lp_ticker.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/lp_ticker.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/lp_ticker.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/nordic_critical.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/nordic_critical.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/nordic_critical.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/nordic_critical.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/objects.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/objects.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/objects.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/objects.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/reloc_vector_table.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/reloc_vector_table.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/reloc_vector_table.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/reloc_vector_table.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/serial_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/serial_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/serial_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/serial_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/sleep.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/sleep.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/sleep.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/sleep.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/spi_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/spi_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/spi_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/spi_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/us_ticker.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/us_ticker.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/PeripheralPins.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/PeripheralPins.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/PeripheralPins.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/PeripheralPins.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/PeripheralPinsDefault.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/PeripheralPinsDefault.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/PeripheralPinsDefault.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/PeripheralPinsDefault.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/analogin_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/analogin_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/analogin_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/analogin_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/common_rtc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/common_rtc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/common_rtc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/common_rtc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/critical_section_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/critical_section_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/critical_section_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/critical_section_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/flash_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/flash_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/flash_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/flash_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/i2c_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/i2c_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/i2c_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/i2c_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/itm_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/itm_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/itm_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/itm_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/lp_ticker.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/lp_ticker.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/lp_ticker.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/lp_ticker.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/mbed_lib.json b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/mbed_lib.json similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/mbed_lib.json rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/mbed_lib.json diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/object_owners.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/object_owners.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/object_owners.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/object_owners.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/object_owners.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/object_owners.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/object_owners.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/object_owners.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/objects.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/objects.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/objects.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/objects.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/pinmap_ex.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pinmap_ex.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/pinmap_ex.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pinmap_ex.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/pinmap_ex.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pinmap_ex.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/pinmap_ex.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pinmap_ex.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/pwmout_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pwmout_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/pwmout_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/pwmout_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/reloc_vector_table.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/reloc_vector_table.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/serial_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/serial_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/serial_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/serial_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/sleep.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/sleep.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/sleep.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/sleep.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/spi_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/spi_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/spi_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/spi_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/trng_api.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/trng_api.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/trng_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/us_ticker.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/us_ticker.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_advertising/ble_advertising.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_advertising/ble_advertising.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_advertising/ble_advertising.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_advertising/ble_advertising.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_advertising/ble_advertising.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_advertising/ble_advertising.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_advertising/ble_advertising.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_advertising/ble_advertising.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_db_discovery/ble_db_discovery.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_db_discovery/ble_db_discovery.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_db_discovery/ble_db_discovery.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_db_discovery/ble_db_discovery.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_db_discovery/ble_db_discovery.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_db_discovery/ble_db_discovery.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_db_discovery/ble_db_discovery.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_db_discovery/ble_db_discovery.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_debug_assert_handler/ble_debug_assert_handler.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_debug_assert_handler/ble_debug_assert_handler.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_debug_assert_handler/ble_debug_assert_handler.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_debug_assert_handler/ble_debug_assert_handler.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_debug_assert_handler/ble_debug_assert_handler.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_debug_assert_handler/ble_debug_assert_handler.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_debug_assert_handler/ble_debug_assert_handler.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_debug_assert_handler/ble_debug_assert_handler.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_dtm/ble_dtm.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_dtm/ble_dtm.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_dtm/ble_dtm.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_dtm/ble_dtm.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_dtm/ble_dtm.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_dtm/ble_dtm.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_dtm/ble_dtm.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_dtm/ble_dtm.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_error_log/ble_error_log.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_error_log/ble_error_log.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_error_log/ble_error_log.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_error_log/ble_error_log.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_racp/ble_racp.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_racp/ble_racp.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_racp/ble_racp.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_racp/ble_racp.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_racp/ble_racp.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_racp/ble_racp.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_racp/ble_racp.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_racp/ble_racp.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_radio_notification/ble_radio_notification.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_radio_notification/ble_radio_notification.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_radio_notification/ble_radio_notification.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_radio_notification/ble_radio_notification.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_radio_notification/ble_radio_notification.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_radio_notification/ble_radio_notification.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_radio_notification/ble_radio_notification.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_radio_notification/ble_radio_notification.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_services/ble_dfu/ble_dfu.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_services/ble_dfu/ble_dfu.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_services/ble_dfu/ble_dfu.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_services/ble_dfu/ble_dfu.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_services/ble_dfu/ble_dfu.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_services/ble_dfu/ble_dfu.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/ble_services/ble_dfu/ble_dfu.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/ble_services/ble_dfu/ble_dfu.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_advdata.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_advdata.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_advdata.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_advdata.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_advdata.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_advdata.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_advdata.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_advdata.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_conn_params.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_conn_params.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_conn_params.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_conn_params.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_conn_state.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_conn_state.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_conn_state.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_conn_state.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_conn_state.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_conn_state.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_conn_state.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_conn_state.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_date_time.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_date_time.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_date_time.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_date_time.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_gatt_db.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_gatt_db.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_gatt_db.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_gatt_db.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_sensor_location.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_sensor_location.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_sensor_location.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_sensor_location.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_srv_common.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_srv_common.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_srv_common.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_srv_common.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_srv_common.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_srv_common.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/common/ble_srv_common.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/common/ble_srv_common.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/device_manager/config/device_manager_cnfg.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/device_manager/config/device_manager_cnfg.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/device_manager/config/device_manager_cnfg.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/device_manager/config/device_manager_cnfg.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/device_manager/device_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/device_manager/device_manager.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/device_manager/device_manager.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/device_manager/device_manager.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/device_manager/device_manager_peripheral.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/device_manager/device_manager_peripheral.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/device_manager/device_manager_peripheral.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/device_manager/device_manager_peripheral.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatt_cache_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatt_cache_manager.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatt_cache_manager.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatt_cache_manager.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatt_cache_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatt_cache_manager.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatt_cache_manager.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatt_cache_manager.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gattc_cache_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gattc_cache_manager.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gattc_cache_manager.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gattc_cache_manager.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gattc_cache_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gattc_cache_manager.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gattc_cache_manager.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gattc_cache_manager.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatts_cache_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatts_cache_manager.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatts_cache_manager.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatts_cache_manager.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatts_cache_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatts_cache_manager.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/gatts_cache_manager.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/gatts_cache_manager.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/id_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/id_manager.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/id_manager.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/id_manager.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/id_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/id_manager.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/id_manager.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/id_manager.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data_storage.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data_storage.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data_storage.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data_storage.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data_storage.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data_storage.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_data_storage.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_data_storage.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_database.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_database.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_database.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_database.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_database.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_database.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_database.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_database.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_id.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_id.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_id.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_id.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_id.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_id.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_id.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_id.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager_internal.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager_internal.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager_internal.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager_types.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager_types.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/peer_manager_types.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/peer_manager_types.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_buffer.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_buffer.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_buffer.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_buffer.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_buffer.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_buffer.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_buffer.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_buffer.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_mutex.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_mutex.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_mutex.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_mutex.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_mutex.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_mutex.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/pm_mutex.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/pm_mutex.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_dispatcher.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_dispatcher.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_dispatcher.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_dispatcher.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_dispatcher.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_dispatcher.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_dispatcher.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_dispatcher.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_manager.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_manager.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_manager.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_manager.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_manager.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_manager.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/ble/peer_manager/security_manager.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/ble/peer_manager/security_manager.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/compiler_abstraction.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/compiler_abstraction.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/compiler_abstraction.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/compiler_abstraction.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51_bitfields.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51_bitfields.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51_bitfields.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51_bitfields.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51_deprecated.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51_deprecated.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51_deprecated.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51_deprecated.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51_to_nrf52.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51_to_nrf52.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf51_to_nrf52.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf51_to_nrf52.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf52.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf52.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf52.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf52.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf52_bitfields.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf52_bitfields.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf52_bitfields.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf52_bitfields.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf52_name_change.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf52_name_change.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/device/nrf52_name_change.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/device/nrf52_name_change.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ble_flash/ble_flash.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ble_flash/ble_flash.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ble_flash/ble_flash.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ble_flash/ble_flash.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ble_flash/ble_flash.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ble_flash/ble_flash.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ble_flash/ble_flash.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ble_flash/ble_flash.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/clock/nrf_drv_clock.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/clock/nrf_drv_clock.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/clock/nrf_drv_clock.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/clock/nrf_drv_clock.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/clock/nrf_drv_clock.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/clock/nrf_drv_clock.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/clock/nrf_drv_clock.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/clock/nrf_drv_clock.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/common/nrf_drv_common.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/common/nrf_drv_common.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/common/nrf_drv_common.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/common/nrf_drv_common.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/common/nrf_drv_common.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/common/nrf_drv_common.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/common/nrf_drv_common.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/common/nrf_drv_common.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/config/nrf_drv_config_validation.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/config/nrf_drv_config_validation.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/config/nrf_drv_config_validation.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/config/nrf_drv_config_validation.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/delay/nrf_delay.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/delay/nrf_delay.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/delay/nrf_delay.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/delay/nrf_delay.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/delay/nrf_delay.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/gpiote/nrf_drv_gpiote.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/gpiote/nrf_drv_gpiote.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/gpiote/nrf_drv_gpiote.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/gpiote/nrf_drv_gpiote.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/gpiote/nrf_drv_gpiote.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/gpiote/nrf_drv_gpiote.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/gpiote/nrf_drv_gpiote.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/gpiote/nrf_drv_gpiote.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_adc.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_adc.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_adc.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_adc.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_adc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_adc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_adc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_adc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_clock.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_clock.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_clock.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_clock.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_ecb.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_ecb.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_ecb.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_ecb.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_ecb.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_ecb.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_ecb.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_ecb.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_gpio.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_gpio.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_gpio.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_gpio.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_gpiote.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_gpiote.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_gpiote.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_gpiote.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_nvmc.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_nvmc.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_nvmc.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_nvmc.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_nvmc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_nvmc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_nvmc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_nvmc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_pdm.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_pdm.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_pdm.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_pdm.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_ppi.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_ppi.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_ppi.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_ppi.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_pwm.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_pwm.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_pwm.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_pwm.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_rng.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_rng.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_rng.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_rng.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_rtc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_rtc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_rtc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_rtc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_saadc.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_saadc.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_saadc.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_saadc.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_saadc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_saadc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_saadc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_saadc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_spi.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_spi.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_spi.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_spi.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_spim.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_spim.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_spim.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_spim.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_spis.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_spis.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_spis.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_spis.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_temp.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_temp.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_temp.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_temp.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_timer.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_timer.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_timer.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_timer.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_twi.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_twi.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_twi.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_twi.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_uart.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_uart.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_uart.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_uart.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_wdt.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_wdt.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/hal/nrf_wdt.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/hal/nrf_wdt.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ppi/nrf_drv_ppi.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ppi/nrf_drv_ppi.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ppi/nrf_drv_ppi.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ppi/nrf_drv_ppi.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ppi/nrf_drv_ppi.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ppi/nrf_drv_ppi.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/ppi/nrf_drv_ppi.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/ppi/nrf_drv_ppi.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/pstorage/config/pstorage_platform.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/pstorage/config/pstorage_platform.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/pstorage/config/pstorage_platform.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/pstorage/config/pstorage_platform.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/pstorage/pstorage.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/pstorage/pstorage.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/pstorage/pstorage.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/pstorage/pstorage.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/pstorage/pstorage.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/pstorage/pstorage.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/pstorage/pstorage.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/pstorage/pstorage.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/rng/nrf_drv_rng.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/rng/nrf_drv_rng.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/rng/nrf_drv_rng.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/rng/nrf_drv_rng.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/rng/nrf_drv_rng.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/rng/nrf_drv_rng.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/rng/nrf_drv_rng.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/rng/nrf_drv_rng.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_master/nrf_drv_spi.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_master/nrf_drv_spi.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_master/nrf_drv_spi.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_master/nrf_drv_spi.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_master/nrf_drv_spi.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_master/nrf_drv_spi.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_master/nrf_drv_spi.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_master/nrf_drv_spi.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_slave/nrf_drv_spis.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_slave/nrf_drv_spis.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_slave/nrf_drv_spis.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_slave/nrf_drv_spis.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_slave/nrf_drv_spis.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_slave/nrf_drv_spis.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/spi_slave/nrf_drv_spis.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/spi_slave/nrf_drv_spis.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/timer/nrf_drv_timer.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/timer/nrf_drv_timer.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/timer/nrf_drv_timer.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/timer/nrf_drv_timer.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/timer/nrf_drv_timer.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/timer/nrf_drv_timer.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/drivers_nrf/timer/nrf_drv_timer.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/drivers_nrf/timer/nrf_drv_timer.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_settings.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_settings.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_settings.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_settings.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_types.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_types.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_types.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_types.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_util.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_util.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_util.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_util.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_util.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_util.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/bootloader_util.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/bootloader_util.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_app_handler.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_app_handler.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_app_handler.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_app_handler.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_app_handler.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_app_handler.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_app_handler.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_app_handler.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_bank_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_bank_internal.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_bank_internal.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_bank_internal.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_ble_svc.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_ble_svc.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_ble_svc.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_ble_svc.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_ble_svc_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_ble_svc_internal.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_ble_svc_internal.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_ble_svc_internal.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_init.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_init.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_init.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_init.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_init_template.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_init_template.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_init_template.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_init_template.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_transport.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_transport.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_transport.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_transport.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_types.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_types.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/dfu_types.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/dfu_types.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/hci_transport/hci_transport_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/hci_transport/hci_transport_config.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/bootloader_dfu/hci_transport/hci_transport_config.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/bootloader_dfu/hci_transport/hci_transport_config.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/crc16/crc16.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/crc16/crc16.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/crc16/crc16.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/crc16/crc16.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/crc16/crc16.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/crc16/crc16.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/crc16/crc16.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/crc16/crc16.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/experimental_section_vars/section_vars.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/experimental_section_vars/section_vars.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/experimental_section_vars/section_vars.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/experimental_section_vars/section_vars.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/config/fds_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/config/fds_config.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/config/fds_config.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/config/fds_config.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/fds.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/fds.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/fds.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/fds.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/fds.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/fds.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/fds.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/fds.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/fds_internal_defs.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/fds_internal_defs.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fds/fds_internal_defs.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fds/fds_internal_defs.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/config/fstorage_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/config/fstorage_config.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/config/fstorage_config.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/config/fstorage_config.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage_internal_defs.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage_internal_defs.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage_internal_defs.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage_internal_defs.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage_nosd.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage_nosd.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/fstorage/fstorage_nosd.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/fstorage/fstorage_nosd.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/config/hci_mem_pool_internal.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/config/hci_mem_pool_internal.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/config/hci_mem_pool_internal.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/config/hci_mem_pool_internal.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/config/hci_transport_config.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/config/hci_transport_config.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/config/hci_transport_config.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/config/hci_transport_config.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/hci_mem_pool.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/hci_mem_pool.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/hci_mem_pool.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/hci_mem_pool.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/hci_mem_pool.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/hci_mem_pool.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/hci/hci_mem_pool.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/hci/hci_mem_pool.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/pwm/app_pwm.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/pwm/app_pwm.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/pwm/app_pwm.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/pwm/app_pwm.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/pwm/app_pwm.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/pwm/app_pwm.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/pwm/app_pwm.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/pwm/app_pwm.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/scheduler/app_scheduler.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/scheduler/app_scheduler.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/scheduler/app_scheduler.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/scheduler/app_scheduler.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/scheduler/app_scheduler.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/scheduler/app_scheduler.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/scheduler/app_scheduler.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/scheduler/app_scheduler.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/trace/app_trace.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/trace/app_trace.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/trace/app_trace.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/trace/app_trace.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/trace/app_trace.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/trace/app_trace.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/trace/app_trace.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/trace/app_trace.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error_weak.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error_weak.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error_weak.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error_weak.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error_weak.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error_weak.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_error_weak.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_error_weak.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util_bds.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util_bds.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util_bds.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util_bds.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util_platform.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util_platform.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util_platform.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util_platform.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util_platform.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util_platform.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/app_util_platform.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/app_util_platform.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/common.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/common.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/common.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/common.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nordic_common.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nordic_common.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nordic_common.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nordic_common.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_assert.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_assert.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_assert.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_assert.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_log.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_log.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_log.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_log.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_log.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_log.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/nrf_log.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_log.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_common.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_common.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_common.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_common.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_errors.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_errors.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_errors.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_errors.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_macros.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_macros.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_macros.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_macros.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_mapped_flags.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_mapped_flags.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_mapped_flags.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_mapped_flags.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_mapped_flags.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_mapped_flags.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_mapped_flags.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_mapped_flags.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_os.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_os.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_os.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_os.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_resources.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_resources.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/libraries/util/sdk_resources.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/sdk_resources.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/ant_stack_handler_types.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/ant_stack_handler_types.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/ant_stack_handler_types.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/ant_stack_handler_types.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/app_ram_base.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/app_ram_base.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/app_ram_base.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/app_ram_base.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/ble_stack_handler_types.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/ble_stack_handler_types.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/ble_stack_handler_types.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/ble_stack_handler_types.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler_appsh.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler_appsh.c similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler_appsh.c rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler_appsh.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler_appsh.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler_appsh.h similarity index 100% rename from targets/TARGET_NORDIC/TARGET_NRF5/TARGET_SDK11/softdevice/common/softdevice_handler/softdevice_handler_appsh.h rename to targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/softdevice/common/softdevice_handler/softdevice_handler_appsh.h diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/gpio_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/gpio_api.c index 9e12311e8e3..c541f224c73 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/gpio_api.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/gpio_api.c @@ -88,7 +88,7 @@ void gpio_init(gpio_t *obj, PinName pin) m_gpio_cfg[obj->pin].used_as_gpio = true; } -#ifdef TARGET_SDK11 +#ifdef TARGET_SDK_11 // implement polyfill of gpio hal for the nRF5 SDK v11 __STATIC_INLINE uint32_t nrf_gpio_pin_out_read(uint32_t pin) { diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/irq_handlers_hw.h b/targets/TARGET_NORDIC/TARGET_NRF5x/irq_handlers_hw.h deleted file mode 100644 index 7eba37ad998..00000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/irq_handlers_hw.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2016 Nordic Semiconductor ASA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA - * integrated circuit in a product or a software update for such product, must reproduce - * the above copyright notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be - * used to endorse or promote products derived from this software without specific prior - * written permission. - * - * 4. This software, with or without modification, must only be used with a - * Nordic Semiconductor ASA integrated circuit. - * - * 5. Any software provided in binary or object form under this license must not be reverse - * engineered, decompiled, modified and/or disassembled. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -/** - * @file irq_handlers_hw.h - * @brief Heleper file for wiring irq handlers to theirs vectors. - */ - -#ifndef IRQ_HANDLERS_HW_H__ -#define IRQ_HANDLERS_HW_H__ - - -typedef struct -{ - IRQn_Type IRQn; - uint32_t vector; -} peripheral_handler_desc_t; - -#endif // IRQ_HANDLERS_HW_H__ - diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/pinmap.c b/targets/TARGET_NORDIC/TARGET_NRF5x/pinmap.c index f723a5837e1..4aa4671c1da 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/pinmap.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/pinmap.c @@ -31,7 +31,7 @@ void pin_mode(PinName pin, PinMode mode) uint32_t pin_number = (uint32_t)pin; -#ifdef TARGET_SDK11 +#ifdef TARGET_SDK_11 NRF_GPIO_Type * reg = NRF_GPIO; #else NRF_GPIO_Type * reg = nrf_gpio_pin_port_decode(&pin_number); diff --git a/targets/targets.json b/targets/targets.json index b789f71ed70..6804dcfcd3b 100755 --- a/targets/targets.json +++ b/targets/targets.json @@ -3436,7 +3436,14 @@ "MBED_TICKLESS" ], "MERGE_BOOTLOADER": false, - "extra_labels": ["NORDIC", "MCU_NRF51", "MCU_NRF51822_UNIFIED", "NRF5", "SDK11"], + "extra_labels": [ + "NORDIC", + "MCU_NRF51", + "MCU_NRF51822_UNIFIED", + "NRF5x", + "NRF51", + "SDK_11" + ], "OUTPUT_EXT": "hex", "is_disk_virtual": true, "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],