diff --git a/.github/actions/deps/ports/action.yml b/.github/actions/deps/ports/action.yml index 8125de2acc487..2412c475c01a5 100644 --- a/.github/actions/deps/ports/action.yml +++ b/.github/actions/deps/ports/action.yml @@ -31,6 +31,6 @@ runs: if: steps.board-to-port.outputs.port == 'litex' uses: ./.github/actions/deps/ports/litex - - name: Set up nrf - if: steps.board-to-port.outputs.port == 'nrf' - uses: ./.github/actions/deps/ports/nrf + - name: Set up nordic + if: steps.board-to-port.outputs.port == 'nordic' + uses: ./.github/actions/deps/ports/nordic diff --git a/.github/actions/deps/ports/nrf/action.yml b/.github/actions/deps/ports/nordic/action.yml similarity index 93% rename from .github/actions/deps/ports/nrf/action.yml rename to .github/actions/deps/ports/nordic/action.yml index d977c937b3dc7..5f08b17ca7a68 100644 --- a/.github/actions/deps/ports/nrf/action.yml +++ b/.github/actions/deps/ports/nordic/action.yml @@ -1,4 +1,4 @@ -name: Fetch nrf port deps +name: Fetch nordic port deps runs: using: composite diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09eb0ebcada09..03cecae231d52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -278,8 +278,8 @@ jobs: run: make -j4 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin - name: build samd51 run: make -j4 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es - - name: build nrf - run: make -j4 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr + - name: build nordic + run: make -j4 -C ports/nordic BOARD=feather_nrf52840_express TRANSLATION=fr - name: build stm run: make -j4 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR # I gave up trying to do esp builds on windows when I saw diff --git a/.gitmodules b/.gitmodules index 8934f17d7cb61..bf521b6c94d7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -63,8 +63,8 @@ [submodule "frozen/Adafruit_CircuitPython_Crickit"] path = frozen/Adafruit_CircuitPython_Crickit url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit -[submodule "ports/nrf/nrfx"] - path = ports/nrf/nrfx +[submodule "ports/nordic/nrfx"] + path = ports/nordic/nrfx url = https://github.com/adafruit/nrfx.git [submodule "lib/tinyusb"] path = lib/tinyusb diff --git a/BUILDING.md b/BUILDING.md index c5b4c5ae9bcc4..34cd544d73658 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -57,7 +57,7 @@ Examples: cd ports/atmel-samd make BOARD=circuitplayground_express - cd ports/nrf + cd ports/nordic make BOARD=circuitplayground_bluefruit If you aren't sure what boards exist, have a peek in the boards subdirectory of your port. diff --git a/Makefile b/Makefile index 2d6a032b9872b..ffbd813c80689 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS) # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(BASEOPTS) -TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/espressif ports/mimxrt10xx ports/nrf ports/raspberrypi ports/stm py shared-bindings shared-module supervisor +TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/espressif ports/mimxrt10xx ports/nordic ports/raspberrypi ports/stm py shared-bindings shared-module supervisor # Paths to exclude from TRANSLATE_SOURCES # Each must be preceded by "-path"; if any wildcards, enclose in quotes. # Separate by "-o" (Find's "or" operand) @@ -284,7 +284,7 @@ update-frozen-libraries: @echo "Updating all frozen libraries to latest tagged version." cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done -one-of-each: samd21 litex mimxrt10xx nrf stm +one-of-each: samd21 litex mimxrt10xx nordic stm samd21: $(MAKE) -C ports/atmel-samd BOARD=trinket_m0 @@ -301,13 +301,13 @@ litex: mimxrt10xx: $(MAKE) -C ports/mimxrt10xx BOARD=feather_mimxrt1011 -nrf: - $(MAKE) -C ports/nrf BOARD=feather_nrf52840_express +nordic: + $(MAKE) -C ports/nordic BOARD=feather_nrf52840_express stm: $(MAKE) -C ports/stm BOARD=feather_stm32f405_express -clean-one-of-each: clean-samd21 clean-samd51 clean-espressif clean-litex clean-mimxrt10xx clean-nrf clean-stm +clean-one-of-each: clean-samd21 clean-samd51 clean-espressif clean-litex clean-mimxrt10xx clean-nordic clean-stm clean-samd21: $(MAKE) -C ports/atmel-samd BOARD=trinket_m0 clean @@ -324,8 +324,8 @@ clean-litex: clean-mimxrt10xx: $(MAKE) -C ports/mimxrt10xx BOARD=feather_mimxrt1011 clean -clean-nrf: - $(MAKE) -C ports/nrf BOARD=feather_nrf52840_express clean +clean-nordic: + $(MAKE) -C ports/nordic BOARD=feather_nrf52840_express clean clean-stm: $(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean diff --git a/README.rst b/README.rst index 9175cfb4a2903..3c169a96ed36d 100644 --- a/README.rst +++ b/README.rst @@ -231,7 +231,7 @@ cxd56 stable espressif ``ESP32`` beta | ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta litex alpha mimxrt10xx alpha -nrf stable +nordic stable raspberrypi stable silabs (efr32) alpha stm ``F4`` stable | ``others`` beta diff --git a/conf.py b/conf.py index 83041272c3b24..d8cf528a3081f 100644 --- a/conf.py +++ b/conf.py @@ -210,12 +210,12 @@ def autoapi_prepare_jinja_env(jinja_env): "ports/minimal", "ports/mimxrt10xx/peripherals", "ports/mimxrt10xx/sdk", - "ports/nrf/device", - "ports/nrf/bluetooth", - "ports/nrf/modules", - "ports/nrf/nrfx", - "ports/nrf/peripherals", - "ports/nrf/usb", + "ports/nordic/device", + "ports/nordic/bluetooth", + "ports/nordic/modules", + "ports/nordic/nrfx", + "ports/nordic/peripherals", + "ports/nordic/usb", "ports/raspberrypi/sdk", "ports/raspberrypi/lib", "ports/silabs/gecko_sdk", diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py index 6a72fe40f322b..6e711bc0dbf32 100644 --- a/docs/shared_bindings_matrix.py +++ b/docs/shared_bindings_matrix.py @@ -38,7 +38,7 @@ "espressif", "litex", "mimxrt10xx", - "nrf", + "nordic", "raspberrypi", "silabs", "stm", diff --git a/docs/supported_ports.rst b/docs/supported_ports.rst index 6112dd3e0eea3..02159083034d4 100644 --- a/docs/supported_ports.rst +++ b/docs/supported_ports.rst @@ -4,9 +4,10 @@ Supported Ports CircuitPython supports a number of microcontroller families. Support quality for each varies depending on the active contributors for each port. -Adafruit sponsored developers are actively contributing to atmel-samd, mimxrt10xx, nrf and stm -ports. They also maintain the other ports in order to ensure the boards build. Additional testing -is limited. +Adafruit sponsored developers are actively contributing to atmel-samd, mimxrt10xx, nordic, +raspberrypi, and stm ports. +They also maintain the other ports in order to ensure the boards build. +Additional testing is limited. .. toctree:: :maxdepth: 2 @@ -17,7 +18,7 @@ is limited. ../ports/espressif/README ../ports/litex/README ../ports/mimxrt10xx/README - ../ports/nrf/README + ../ports/nordic/README ../ports/raspberrypi/README ../ports/silabs/README ../ports/stm/README diff --git a/docs/workflows.md b/docs/workflows.md index 875b4c900966f..727cc5401caf8 100644 --- a/docs/workflows.md +++ b/docs/workflows.md @@ -35,7 +35,7 @@ a reset into bootloader.) ## BLE -The BLE workflow is enabled for nRF boards. By default, to prevent malicious access, it is disabled. +The BLE workflow is enabled for Nordic boards. By default, to prevent malicious access, it is disabled. To connect to the BLE workflow, press the reset button while the status led blinks blue quickly after the safe mode blinks. The board will restart and broadcast the file transfer service UUID (`0xfebb`) along with the board's [Creation IDs](https://github.com/creationid/creators). This diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 7985794d67c6c..17e7e1f36655d 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -90,7 +90,7 @@ msgstr "" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -236,7 +236,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -461,7 +461,7 @@ msgid "Address must be %d bytes long" msgstr "" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -476,7 +476,7 @@ msgstr "" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "" @@ -486,17 +486,17 @@ msgstr "" msgid "All RX FIFOs in use" msgstr "" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -527,15 +527,16 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "" @@ -676,7 +677,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -719,7 +720,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "" @@ -741,12 +742,12 @@ msgstr "" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "" @@ -779,7 +780,7 @@ msgstr "" msgid "Cannot subclass slice" msgstr "" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -838,7 +839,7 @@ msgid "DAC already in use" msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" @@ -851,12 +852,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "" @@ -872,7 +873,7 @@ msgstr "" msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "" @@ -921,7 +922,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -937,7 +938,7 @@ msgstr "" msgid "Failed sending command." msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "" @@ -968,11 +969,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "" @@ -980,7 +981,7 @@ msgstr "" msgid "Failed to parse MP3 file" msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "" @@ -1112,11 +1113,11 @@ msgstr "" msgid "Input/output error" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "" @@ -1192,7 +1193,7 @@ msgid "Invalid ADC Unit value" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1372,7 +1373,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1382,7 +1384,7 @@ msgid "No %q pin" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1461,7 +1463,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1490,7 +1492,7 @@ msgstr "" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1499,7 +1501,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "" @@ -1523,7 +1525,7 @@ msgid "" "Object has been deinitialized and can no longer be used. Create a new object." msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "" @@ -1590,7 +1592,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1763,7 +1765,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1866,7 +1868,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -1983,7 +1985,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2005,7 +2007,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2121,7 +2123,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "" @@ -2145,7 +2147,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2155,7 +2157,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2165,7 +2167,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2181,7 +2183,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2209,15 +2211,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2233,7 +2235,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2260,7 +2262,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2314,7 +2316,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2901,7 +2903,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3391,8 +3393,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3552,7 +3554,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3564,7 +3566,7 @@ msgstr "" msgid "non-hex digit found" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3670,7 +3672,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3687,7 +3689,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3799,7 +3801,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4019,11 +4021,11 @@ msgstr "" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" diff --git a/ports/nrf/.gitignore b/ports/nordic/.gitignore similarity index 100% rename from ports/nrf/.gitignore rename to ports/nordic/.gitignore diff --git a/ports/nrf/Makefile b/ports/nordic/Makefile similarity index 100% rename from ports/nrf/Makefile rename to ports/nordic/Makefile diff --git a/ports/nrf/README.md b/ports/nordic/README.md similarity index 100% rename from ports/nrf/README.md rename to ports/nordic/README.md diff --git a/ports/nrf/background.c b/ports/nordic/background.c similarity index 100% rename from ports/nrf/background.c rename to ports/nordic/background.c diff --git a/ports/nrf/background.h b/ports/nordic/background.h similarity index 100% rename from ports/nrf/background.h rename to ports/nordic/background.h diff --git a/ports/nrf/bluetooth/ble_drv.c b/ports/nordic/bluetooth/ble_drv.c similarity index 100% rename from ports/nrf/bluetooth/ble_drv.c rename to ports/nordic/bluetooth/ble_drv.c diff --git a/ports/nrf/bluetooth/ble_drv.h b/ports/nordic/bluetooth/ble_drv.h similarity index 100% rename from ports/nrf/bluetooth/ble_drv.h rename to ports/nordic/bluetooth/ble_drv.h diff --git a/ports/nrf/bluetooth/bluetooth_common.mk b/ports/nordic/bluetooth/bluetooth_common.mk similarity index 100% rename from ports/nrf/bluetooth/bluetooth_common.mk rename to ports/nordic/bluetooth/bluetooth_common.mk diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/board.c b/ports/nordic/boards/ADM_B_NRF52840_1/board.c similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/board.c rename to ports/nordic/boards/ADM_B_NRF52840_1/board.c diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.h b/ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.h rename to ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.h diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.mk b/ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.mk rename to ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.mk diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/pins.c b/ports/nordic/boards/ADM_B_NRF52840_1/pins.c similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/pins.c rename to ports/nordic/boards/ADM_B_NRF52840_1/pins.c diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/board.c similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/board.c diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c diff --git a/ports/nrf/boards/TG-Watch/board.c b/ports/nordic/boards/TG-Watch/board.c similarity index 100% rename from ports/nrf/boards/TG-Watch/board.c rename to ports/nordic/boards/TG-Watch/board.c diff --git a/ports/nrf/boards/TG-Watch/mpconfigboard.h b/ports/nordic/boards/TG-Watch/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/TG-Watch/mpconfigboard.h rename to ports/nordic/boards/TG-Watch/mpconfigboard.h diff --git a/ports/nrf/boards/TG-Watch/mpconfigboard.mk b/ports/nordic/boards/TG-Watch/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/TG-Watch/mpconfigboard.mk rename to ports/nordic/boards/TG-Watch/mpconfigboard.mk diff --git a/ports/nrf/boards/TG-Watch/pins.c b/ports/nordic/boards/TG-Watch/pins.c similarity index 100% rename from ports/nrf/boards/TG-Watch/pins.c rename to ports/nordic/boards/TG-Watch/pins.c diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c b/ports/nordic/boards/adafruit_led_glasses_nrf52840/board.c similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/board.c diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h b/ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk b/ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c b/ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c diff --git a/ports/nrf/boards/aramcon2_badge/board.c b/ports/nordic/boards/aramcon2_badge/board.c similarity index 100% rename from ports/nrf/boards/aramcon2_badge/board.c rename to ports/nordic/boards/aramcon2_badge/board.c diff --git a/ports/nrf/boards/aramcon2_badge/mpconfigboard.h b/ports/nordic/boards/aramcon2_badge/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/aramcon2_badge/mpconfigboard.h rename to ports/nordic/boards/aramcon2_badge/mpconfigboard.h diff --git a/ports/nrf/boards/aramcon2_badge/mpconfigboard.mk b/ports/nordic/boards/aramcon2_badge/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/aramcon2_badge/mpconfigboard.mk rename to ports/nordic/boards/aramcon2_badge/mpconfigboard.mk diff --git a/ports/nrf/boards/aramcon2_badge/pins.c b/ports/nordic/boards/aramcon2_badge/pins.c similarity index 100% rename from ports/nrf/boards/aramcon2_badge/pins.c rename to ports/nordic/boards/aramcon2_badge/pins.c diff --git a/ports/nrf/boards/aramcon_badge_2019/board.c b/ports/nordic/boards/aramcon_badge_2019/board.c similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/board.c rename to ports/nordic/boards/aramcon_badge_2019/board.c diff --git a/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.h b/ports/nordic/boards/aramcon_badge_2019/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/mpconfigboard.h rename to ports/nordic/boards/aramcon_badge_2019/mpconfigboard.h diff --git a/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk b/ports/nordic/boards/aramcon_badge_2019/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk rename to ports/nordic/boards/aramcon_badge_2019/mpconfigboard.mk diff --git a/ports/nrf/boards/aramcon_badge_2019/pins.c b/ports/nordic/boards/aramcon_badge_2019/pins.c similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/pins.c rename to ports/nordic/boards/aramcon_badge_2019/pins.c diff --git a/ports/nrf/boards/arduino_nano_33_ble/README.md b/ports/nordic/boards/arduino_nano_33_ble/README.md similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/README.md rename to ports/nordic/boards/arduino_nano_33_ble/README.md diff --git a/ports/nrf/boards/arduino_nano_33_ble/board.c b/ports/nordic/boards/arduino_nano_33_ble/board.c similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/board.c rename to ports/nordic/boards/arduino_nano_33_ble/board.c diff --git a/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.h b/ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.h rename to ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.h diff --git a/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.mk b/ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.mk rename to ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.mk diff --git a/ports/nrf/boards/arduino_nano_33_ble/pins.c b/ports/nordic/boards/arduino_nano_33_ble/pins.c similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/pins.c rename to ports/nordic/boards/arduino_nano_33_ble/pins.c diff --git a/ports/nrf/boards/bastble/README.md b/ports/nordic/boards/bastble/README.md similarity index 100% rename from ports/nrf/boards/bastble/README.md rename to ports/nordic/boards/bastble/README.md diff --git a/ports/nrf/boards/bastble/board.c b/ports/nordic/boards/bastble/board.c similarity index 100% rename from ports/nrf/boards/bastble/board.c rename to ports/nordic/boards/bastble/board.c diff --git a/ports/nrf/boards/bastble/mpconfigboard.h b/ports/nordic/boards/bastble/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bastble/mpconfigboard.h rename to ports/nordic/boards/bastble/mpconfigboard.h diff --git a/ports/nrf/boards/bastble/mpconfigboard.mk b/ports/nordic/boards/bastble/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bastble/mpconfigboard.mk rename to ports/nordic/boards/bastble/mpconfigboard.mk diff --git a/ports/nrf/boards/bastble/pins.c b/ports/nordic/boards/bastble/pins.c similarity index 100% rename from ports/nrf/boards/bastble/pins.c rename to ports/nordic/boards/bastble/pins.c diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/board.c b/ports/nordic/boards/bless_dev_board_multi_sensor/board.c similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/board.c rename to ports/nordic/boards/bless_dev_board_multi_sensor/board.c diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.h b/ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.h rename to ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.h diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.mk b/ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.mk rename to ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.mk diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/pins.c b/ports/nordic/boards/bless_dev_board_multi_sensor/pins.c similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/pins.c rename to ports/nordic/boards/bless_dev_board_multi_sensor/pins.c diff --git a/ports/nrf/boards/bluemicro833/board.c b/ports/nordic/boards/bluemicro833/board.c similarity index 100% rename from ports/nrf/boards/bluemicro833/board.c rename to ports/nordic/boards/bluemicro833/board.c diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.h b/ports/nordic/boards/bluemicro833/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bluemicro833/mpconfigboard.h rename to ports/nordic/boards/bluemicro833/mpconfigboard.h diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nordic/boards/bluemicro833/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bluemicro833/mpconfigboard.mk rename to ports/nordic/boards/bluemicro833/mpconfigboard.mk diff --git a/ports/nrf/boards/bluemicro833/pins.c b/ports/nordic/boards/bluemicro833/pins.c similarity index 100% rename from ports/nrf/boards/bluemicro833/pins.c rename to ports/nordic/boards/bluemicro833/pins.c diff --git a/ports/nrf/boards/bluemicro840/board.c b/ports/nordic/boards/bluemicro840/board.c similarity index 100% rename from ports/nrf/boards/bluemicro840/board.c rename to ports/nordic/boards/bluemicro840/board.c diff --git a/ports/nrf/boards/bluemicro840/mpconfigboard.h b/ports/nordic/boards/bluemicro840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bluemicro840/mpconfigboard.h rename to ports/nordic/boards/bluemicro840/mpconfigboard.h diff --git a/ports/nrf/boards/bluemicro840/mpconfigboard.mk b/ports/nordic/boards/bluemicro840/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bluemicro840/mpconfigboard.mk rename to ports/nordic/boards/bluemicro840/mpconfigboard.mk diff --git a/ports/nrf/boards/bluemicro840/pins.c b/ports/nordic/boards/bluemicro840/pins.c similarity index 100% rename from ports/nrf/boards/bluemicro840/pins.c rename to ports/nordic/boards/bluemicro840/pins.c diff --git a/ports/nrf/boards/challenger_840/board.c b/ports/nordic/boards/challenger_840/board.c similarity index 100% rename from ports/nrf/boards/challenger_840/board.c rename to ports/nordic/boards/challenger_840/board.c diff --git a/ports/nrf/boards/challenger_840/challenger_840.py b/ports/nordic/boards/challenger_840/challenger_840.py similarity index 100% rename from ports/nrf/boards/challenger_840/challenger_840.py rename to ports/nordic/boards/challenger_840/challenger_840.py diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.h b/ports/nordic/boards/challenger_840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/challenger_840/mpconfigboard.h rename to ports/nordic/boards/challenger_840/mpconfigboard.h diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.mk b/ports/nordic/boards/challenger_840/mpconfigboard.mk similarity index 85% rename from ports/nrf/boards/challenger_840/mpconfigboard.mk rename to ports/nordic/boards/challenger_840/mpconfigboard.mk index 03cbc20b21279..a1dbe1e642998 100644 --- a/ports/nrf/boards/challenger_840/mpconfigboard.mk +++ b/ports/nordic/boards/challenger_840/mpconfigboard.mk @@ -8,6 +8,6 @@ MCU_CHIP = nrf52840 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32FV,W25Q32JVxQ,W25Q64FV,W25Q64JVxQ" -FROZEN_MPY_DIRS += $(TOP)/ports/nrf/boards/challenger_840 +FROZEN_MPY_DIRS += $(TOP)/ports/nordic/boards/challenger_840 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/nrf/boards/challenger_840/pins.c b/ports/nordic/boards/challenger_840/pins.c similarity index 100% rename from ports/nrf/boards/challenger_840/pins.c rename to ports/nordic/boards/challenger_840/pins.c diff --git a/ports/nrf/boards/circuitplayground_bluefruit/board.c b/ports/nordic/boards/circuitplayground_bluefruit/board.c similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/board.c rename to ports/nordic/boards/circuitplayground_bluefruit/board.c diff --git a/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h b/ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h rename to ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.h diff --git a/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.mk b/ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.mk rename to ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.mk diff --git a/ports/nrf/boards/circuitplayground_bluefruit/pins.c b/ports/nordic/boards/circuitplayground_bluefruit/pins.c similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/pins.c rename to ports/nordic/boards/circuitplayground_bluefruit/pins.c diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nordic/boards/clue_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/board.c rename to ports/nordic/boards/clue_nrf52840_express/board.c diff --git a/ports/nrf/boards/clue_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/clue_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/clue_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/clue_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/clue_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/clue_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/clue_nrf52840_express/pins.c b/ports/nordic/boards/clue_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/pins.c rename to ports/nordic/boards/clue_nrf52840_express/pins.c diff --git a/ports/nrf/boards/common.template.ld b/ports/nordic/boards/common.template.ld similarity index 100% rename from ports/nrf/boards/common.template.ld rename to ports/nordic/boards/common.template.ld diff --git a/ports/nrf/boards/electronut_labs_blip/board.c b/ports/nordic/boards/electronut_labs_blip/board.c similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/board.c rename to ports/nordic/boards/electronut_labs_blip/board.c diff --git a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.h b/ports/nordic/boards/electronut_labs_blip/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/mpconfigboard.h rename to ports/nordic/boards/electronut_labs_blip/mpconfigboard.h diff --git a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk b/ports/nordic/boards/electronut_labs_blip/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk rename to ports/nordic/boards/electronut_labs_blip/mpconfigboard.mk diff --git a/ports/nrf/boards/electronut_labs_blip/pins.c b/ports/nordic/boards/electronut_labs_blip/pins.c similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/pins.c rename to ports/nordic/boards/electronut_labs_blip/pins.c diff --git a/ports/nrf/boards/electronut_labs_papyr/board.c b/ports/nordic/boards/electronut_labs_papyr/board.c similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/board.c rename to ports/nordic/boards/electronut_labs_papyr/board.c diff --git a/ports/nrf/boards/electronut_labs_papyr/mpconfigboard.h b/ports/nordic/boards/electronut_labs_papyr/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/mpconfigboard.h rename to ports/nordic/boards/electronut_labs_papyr/mpconfigboard.h diff --git a/ports/nrf/boards/electronut_labs_papyr/mpconfigboard.mk b/ports/nordic/boards/electronut_labs_papyr/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/mpconfigboard.mk rename to ports/nordic/boards/electronut_labs_papyr/mpconfigboard.mk diff --git a/ports/nrf/boards/electronut_labs_papyr/pins.c b/ports/nordic/boards/electronut_labs_papyr/pins.c similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/pins.c rename to ports/nordic/boards/electronut_labs_papyr/pins.c diff --git a/ports/nrf/boards/espruino_banglejs2/board.c b/ports/nordic/boards/espruino_banglejs2/board.c similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/board.c rename to ports/nordic/boards/espruino_banglejs2/board.c diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.h b/ports/nordic/boards/espruino_banglejs2/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/mpconfigboard.h rename to ports/nordic/boards/espruino_banglejs2/mpconfigboard.h diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk b/ports/nordic/boards/espruino_banglejs2/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk rename to ports/nordic/boards/espruino_banglejs2/mpconfigboard.mk diff --git a/ports/nrf/boards/espruino_banglejs2/pins.c b/ports/nordic/boards/espruino_banglejs2/pins.c similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/pins.c rename to ports/nordic/boards/espruino_banglejs2/pins.c diff --git a/ports/nrf/boards/feather_bluefruit_sense/board.c b/ports/nordic/boards/feather_bluefruit_sense/board.c similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/board.c rename to ports/nordic/boards/feather_bluefruit_sense/board.c diff --git a/ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.h b/ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.h rename to ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.h diff --git a/ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.mk b/ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.mk rename to ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.mk diff --git a/ports/nrf/boards/feather_bluefruit_sense/pins.c b/ports/nordic/boards/feather_bluefruit_sense/pins.c similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/pins.c rename to ports/nordic/boards/feather_bluefruit_sense/pins.c diff --git a/ports/nrf/boards/feather_nrf52840_express/board.c b/ports/nordic/boards/feather_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/board.c rename to ports/nordic/boards/feather_nrf52840_express/board.c diff --git a/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/feather_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/feather_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/feather_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/feather_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/feather_nrf52840_express/pins.c b/ports/nordic/boards/feather_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/pins.c rename to ports/nordic/boards/feather_nrf52840_express/pins.c diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nordic/boards/hiibot_bluefi/board.c similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/board.c rename to ports/nordic/boards/hiibot_bluefi/board.c diff --git a/ports/nrf/boards/hiibot_bluefi/mpconfigboard.h b/ports/nordic/boards/hiibot_bluefi/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/mpconfigboard.h rename to ports/nordic/boards/hiibot_bluefi/mpconfigboard.h diff --git a/ports/nrf/boards/hiibot_bluefi/mpconfigboard.mk b/ports/nordic/boards/hiibot_bluefi/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/mpconfigboard.mk rename to ports/nordic/boards/hiibot_bluefi/mpconfigboard.mk diff --git a/ports/nrf/boards/hiibot_bluefi/pins.c b/ports/nordic/boards/hiibot_bluefi/pins.c similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/pins.c rename to ports/nordic/boards/hiibot_bluefi/pins.c diff --git a/ports/nrf/boards/ikigaisense_vita/board.c b/ports/nordic/boards/ikigaisense_vita/board.c similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/board.c rename to ports/nordic/boards/ikigaisense_vita/board.c diff --git a/ports/nrf/boards/ikigaisense_vita/mpconfigboard.h b/ports/nordic/boards/ikigaisense_vita/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/mpconfigboard.h rename to ports/nordic/boards/ikigaisense_vita/mpconfigboard.h diff --git a/ports/nrf/boards/ikigaisense_vita/mpconfigboard.mk b/ports/nordic/boards/ikigaisense_vita/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/mpconfigboard.mk rename to ports/nordic/boards/ikigaisense_vita/mpconfigboard.mk diff --git a/ports/nrf/boards/ikigaisense_vita/pins.c b/ports/nordic/boards/ikigaisense_vita/pins.c similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/pins.c rename to ports/nordic/boards/ikigaisense_vita/pins.c diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/board.c b/ports/nordic/boards/itsybitsy_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/board.c rename to ports/nordic/boards/itsybitsy_nrf52840_express/board.c diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/pins.c b/ports/nordic/boards/itsybitsy_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/pins.c rename to ports/nordic/boards/itsybitsy_nrf52840_express/pins.c diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/README.md b/ports/nordic/boards/makerdiary_m60_keyboard/README.md similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/README.md rename to ports/nordic/boards/makerdiary_m60_keyboard/README.md diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/board.c b/ports/nordic/boards/makerdiary_m60_keyboard/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/board.c rename to ports/nordic/boards/makerdiary_m60_keyboard/board.c diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.h b/ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.h rename to ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.mk b/ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/pins.c b/ports/nordic/boards/makerdiary_m60_keyboard/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/pins.c rename to ports/nordic/boards/makerdiary_m60_keyboard/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/README.md b/ports/nordic/boards/makerdiary_nrf52840_connectkit/README.md similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/README.md rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/README.md diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/board.c b/ports/nordic/boards/makerdiary_nrf52840_connectkit/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/board.c rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/pins.c b/ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/README.md b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/README.md similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/README.md rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/README.md diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/pins.c b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/board.c b/ports/nordic/boards/makerdiary_nrf52840_mdk/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/board.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c b/ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c diff --git a/ports/nrf/boards/metro_nrf52840_express/board.c b/ports/nordic/boards/metro_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/board.c rename to ports/nordic/boards/metro_nrf52840_express/board.c diff --git a/ports/nrf/boards/metro_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/metro_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/metro_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/metro_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/metro_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/metro_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/metro_nrf52840_express/pins.c b/ports/nordic/boards/metro_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/pins.c rename to ports/nordic/boards/metro_nrf52840_express/pins.c diff --git a/ports/nrf/boards/microbit_v2/board.c b/ports/nordic/boards/microbit_v2/board.c similarity index 100% rename from ports/nrf/boards/microbit_v2/board.c rename to ports/nordic/boards/microbit_v2/board.c diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.h b/ports/nordic/boards/microbit_v2/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/microbit_v2/mpconfigboard.h rename to ports/nordic/boards/microbit_v2/mpconfigboard.h diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.mk b/ports/nordic/boards/microbit_v2/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/microbit_v2/mpconfigboard.mk rename to ports/nordic/boards/microbit_v2/mpconfigboard.mk diff --git a/ports/nrf/boards/microbit_v2/pins.c b/ports/nordic/boards/microbit_v2/pins.c similarity index 100% rename from ports/nrf/boards/microbit_v2/pins.c rename to ports/nordic/boards/microbit_v2/pins.c diff --git a/ports/nrf/boards/nice_nano/board.c b/ports/nordic/boards/nice_nano/board.c similarity index 100% rename from ports/nrf/boards/nice_nano/board.c rename to ports/nordic/boards/nice_nano/board.c diff --git a/ports/nrf/boards/nice_nano/mpconfigboard.h b/ports/nordic/boards/nice_nano/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/nice_nano/mpconfigboard.h rename to ports/nordic/boards/nice_nano/mpconfigboard.h diff --git a/ports/nrf/boards/nice_nano/mpconfigboard.mk b/ports/nordic/boards/nice_nano/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/nice_nano/mpconfigboard.mk rename to ports/nordic/boards/nice_nano/mpconfigboard.mk diff --git a/ports/nrf/boards/nice_nano/pins.c b/ports/nordic/boards/nice_nano/pins.c similarity index 100% rename from ports/nrf/boards/nice_nano/pins.c rename to ports/nordic/boards/nice_nano/pins.c diff --git a/ports/nrf/boards/nrf52_prefix.c b/ports/nordic/boards/nrf52_prefix.c similarity index 100% rename from ports/nrf/boards/nrf52_prefix.c rename to ports/nordic/boards/nrf52_prefix.c diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nordic/boards/ohs2020_badge/board.c similarity index 100% rename from ports/nrf/boards/ohs2020_badge/board.c rename to ports/nordic/boards/ohs2020_badge/board.c diff --git a/ports/nrf/boards/ohs2020_badge/mpconfigboard.h b/ports/nordic/boards/ohs2020_badge/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ohs2020_badge/mpconfigboard.h rename to ports/nordic/boards/ohs2020_badge/mpconfigboard.h diff --git a/ports/nrf/boards/ohs2020_badge/mpconfigboard.mk b/ports/nordic/boards/ohs2020_badge/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ohs2020_badge/mpconfigboard.mk rename to ports/nordic/boards/ohs2020_badge/mpconfigboard.mk diff --git a/ports/nrf/boards/ohs2020_badge/pins.c b/ports/nordic/boards/ohs2020_badge/pins.c similarity index 100% rename from ports/nrf/boards/ohs2020_badge/pins.c rename to ports/nordic/boards/ohs2020_badge/pins.c diff --git a/ports/nrf/boards/particle_argon/board.c b/ports/nordic/boards/particle_argon/board.c similarity index 100% rename from ports/nrf/boards/particle_argon/board.c rename to ports/nordic/boards/particle_argon/board.c diff --git a/ports/nrf/boards/particle_argon/mpconfigboard.h b/ports/nordic/boards/particle_argon/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/particle_argon/mpconfigboard.h rename to ports/nordic/boards/particle_argon/mpconfigboard.h diff --git a/ports/nrf/boards/particle_argon/mpconfigboard.mk b/ports/nordic/boards/particle_argon/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/particle_argon/mpconfigboard.mk rename to ports/nordic/boards/particle_argon/mpconfigboard.mk diff --git a/ports/nrf/boards/particle_argon/pins.c b/ports/nordic/boards/particle_argon/pins.c similarity index 100% rename from ports/nrf/boards/particle_argon/pins.c rename to ports/nordic/boards/particle_argon/pins.c diff --git a/ports/nrf/boards/particle_boron/board.c b/ports/nordic/boards/particle_boron/board.c similarity index 100% rename from ports/nrf/boards/particle_boron/board.c rename to ports/nordic/boards/particle_boron/board.c diff --git a/ports/nrf/boards/particle_boron/mpconfigboard.h b/ports/nordic/boards/particle_boron/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/particle_boron/mpconfigboard.h rename to ports/nordic/boards/particle_boron/mpconfigboard.h diff --git a/ports/nrf/boards/particle_boron/mpconfigboard.mk b/ports/nordic/boards/particle_boron/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/particle_boron/mpconfigboard.mk rename to ports/nordic/boards/particle_boron/mpconfigboard.mk diff --git a/ports/nrf/boards/particle_boron/pins.c b/ports/nordic/boards/particle_boron/pins.c similarity index 100% rename from ports/nrf/boards/particle_boron/pins.c rename to ports/nordic/boards/particle_boron/pins.c diff --git a/ports/nrf/boards/particle_xenon/board.c b/ports/nordic/boards/particle_xenon/board.c similarity index 100% rename from ports/nrf/boards/particle_xenon/board.c rename to ports/nordic/boards/particle_xenon/board.c diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.h b/ports/nordic/boards/particle_xenon/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/particle_xenon/mpconfigboard.h rename to ports/nordic/boards/particle_xenon/mpconfigboard.h diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.mk b/ports/nordic/boards/particle_xenon/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/particle_xenon/mpconfigboard.mk rename to ports/nordic/boards/particle_xenon/mpconfigboard.mk diff --git a/ports/nrf/boards/particle_xenon/pins.c b/ports/nordic/boards/particle_xenon/pins.c similarity index 100% rename from ports/nrf/boards/particle_xenon/pins.c rename to ports/nordic/boards/particle_xenon/pins.c diff --git a/ports/nrf/boards/pca10056/board.c b/ports/nordic/boards/pca10056/board.c similarity index 100% rename from ports/nrf/boards/pca10056/board.c rename to ports/nordic/boards/pca10056/board.c diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nordic/boards/pca10056/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pca10056/mpconfigboard.h rename to ports/nordic/boards/pca10056/mpconfigboard.h diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nordic/boards/pca10056/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pca10056/mpconfigboard.mk rename to ports/nordic/boards/pca10056/mpconfigboard.mk diff --git a/ports/nrf/boards/pca10056/pins.c b/ports/nordic/boards/pca10056/pins.c similarity index 100% rename from ports/nrf/boards/pca10056/pins.c rename to ports/nordic/boards/pca10056/pins.c diff --git a/ports/nrf/boards/pca10059/board.c b/ports/nordic/boards/pca10059/board.c similarity index 100% rename from ports/nrf/boards/pca10059/board.c rename to ports/nordic/boards/pca10059/board.c diff --git a/ports/nrf/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip b/ports/nordic/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip similarity index 100% rename from ports/nrf/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip rename to ports/nordic/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nordic/boards/pca10059/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pca10059/mpconfigboard.h rename to ports/nordic/boards/pca10059/mpconfigboard.h diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nordic/boards/pca10059/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pca10059/mpconfigboard.mk rename to ports/nordic/boards/pca10059/mpconfigboard.mk diff --git a/ports/nrf/boards/pca10059/pins.c b/ports/nordic/boards/pca10059/pins.c similarity index 100% rename from ports/nrf/boards/pca10059/pins.c rename to ports/nordic/boards/pca10059/pins.c diff --git a/ports/nrf/boards/pca10100/board.c b/ports/nordic/boards/pca10100/board.c similarity index 100% rename from ports/nrf/boards/pca10100/board.c rename to ports/nordic/boards/pca10100/board.c diff --git a/ports/nrf/boards/pca10100/mpconfigboard.h b/ports/nordic/boards/pca10100/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pca10100/mpconfigboard.h rename to ports/nordic/boards/pca10100/mpconfigboard.h diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nordic/boards/pca10100/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pca10100/mpconfigboard.mk rename to ports/nordic/boards/pca10100/mpconfigboard.mk diff --git a/ports/nrf/boards/pca10100/pins.c b/ports/nordic/boards/pca10100/pins.c similarity index 100% rename from ports/nrf/boards/pca10100/pins.c rename to ports/nordic/boards/pca10100/pins.c diff --git a/ports/nrf/boards/pctel_wsc_1450/board.c b/ports/nordic/boards/pctel_wsc_1450/board.c similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/board.c rename to ports/nordic/boards/pctel_wsc_1450/board.c diff --git a/ports/nrf/boards/pctel_wsc_1450/mpconfigboard.h b/ports/nordic/boards/pctel_wsc_1450/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/mpconfigboard.h rename to ports/nordic/boards/pctel_wsc_1450/mpconfigboard.h diff --git a/ports/nrf/boards/pctel_wsc_1450/mpconfigboard.mk b/ports/nordic/boards/pctel_wsc_1450/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/mpconfigboard.mk rename to ports/nordic/boards/pctel_wsc_1450/mpconfigboard.mk diff --git a/ports/nrf/boards/pctel_wsc_1450/pins.c b/ports/nordic/boards/pctel_wsc_1450/pins.c similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/pins.c rename to ports/nordic/boards/pctel_wsc_1450/pins.c diff --git a/ports/nrf/boards/pillbug/board.c b/ports/nordic/boards/pillbug/board.c similarity index 100% rename from ports/nrf/boards/pillbug/board.c rename to ports/nordic/boards/pillbug/board.c diff --git a/ports/nrf/boards/pillbug/mpconfigboard.h b/ports/nordic/boards/pillbug/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pillbug/mpconfigboard.h rename to ports/nordic/boards/pillbug/mpconfigboard.h diff --git a/ports/nrf/boards/pillbug/mpconfigboard.mk b/ports/nordic/boards/pillbug/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pillbug/mpconfigboard.mk rename to ports/nordic/boards/pillbug/mpconfigboard.mk diff --git a/ports/nrf/boards/pillbug/pins.c b/ports/nordic/boards/pillbug/pins.c similarity index 100% rename from ports/nrf/boards/pillbug/pins.c rename to ports/nordic/boards/pillbug/pins.c diff --git a/ports/nrf/boards/pitaya_go/board.c b/ports/nordic/boards/pitaya_go/board.c similarity index 100% rename from ports/nrf/boards/pitaya_go/board.c rename to ports/nordic/boards/pitaya_go/board.c diff --git a/ports/nrf/boards/pitaya_go/mpconfigboard.h b/ports/nordic/boards/pitaya_go/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pitaya_go/mpconfigboard.h rename to ports/nordic/boards/pitaya_go/mpconfigboard.h diff --git a/ports/nrf/boards/pitaya_go/mpconfigboard.mk b/ports/nordic/boards/pitaya_go/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pitaya_go/mpconfigboard.mk rename to ports/nordic/boards/pitaya_go/mpconfigboard.mk diff --git a/ports/nrf/boards/pitaya_go/pins.c b/ports/nordic/boards/pitaya_go/pins.c similarity index 100% rename from ports/nrf/boards/pitaya_go/pins.c rename to ports/nordic/boards/pitaya_go/pins.c diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/board.c b/ports/nordic/boards/raytac_mdbt50q-db-40/board.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/board.c rename to ports/nordic/boards/raytac_mdbt50q-db-40/board.c diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip b/ports/nordic/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip rename to ports/nordic/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.h b/ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.h rename to ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.h diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.mk b/ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.mk rename to ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.mk diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/pins.c b/ports/nordic/boards/raytac_mdbt50q-db-40/pins.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/pins.c rename to ports/nordic/boards/raytac_mdbt50q-db-40/pins.c diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/board.c b/ports/nordic/boards/raytac_mdbt50q-rx/board.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/board.c rename to ports/nordic/boards/raytac_mdbt50q-rx/board.c diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.h b/ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.h rename to ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.h diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.mk b/ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.mk rename to ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.mk diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/pins.c b/ports/nordic/boards/raytac_mdbt50q-rx/pins.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/pins.c rename to ports/nordic/boards/raytac_mdbt50q-rx/pins.c diff --git a/ports/nrf/boards/simmel/board.c b/ports/nordic/boards/simmel/board.c similarity index 100% rename from ports/nrf/boards/simmel/board.c rename to ports/nordic/boards/simmel/board.c diff --git a/ports/nrf/boards/simmel/mpconfigboard.h b/ports/nordic/boards/simmel/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/simmel/mpconfigboard.h rename to ports/nordic/boards/simmel/mpconfigboard.h diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nordic/boards/simmel/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/simmel/mpconfigboard.mk rename to ports/nordic/boards/simmel/mpconfigboard.mk diff --git a/ports/nrf/boards/simmel/pins.c b/ports/nordic/boards/simmel/pins.c similarity index 100% rename from ports/nrf/boards/simmel/pins.c rename to ports/nordic/boards/simmel/pins.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/README.md b/ports/nordic/boards/sparkfun_nrf52840_micromod/README.md similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/README.md rename to ports/nordic/boards/sparkfun_nrf52840_micromod/README.md diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/board.c b/ports/nordic/boards/sparkfun_nrf52840_micromod/board.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/board.c rename to ports/nordic/boards/sparkfun_nrf52840_micromod/board.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.h b/ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.h rename to ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.h diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk b/ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk rename to ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/pins.c b/ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/pins.c rename to ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/README.md b/ports/nordic/boards/sparkfun_nrf52840_mini/README.md similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/README.md rename to ports/nordic/boards/sparkfun_nrf52840_mini/README.md diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/board.c b/ports/nordic/boards/sparkfun_nrf52840_mini/board.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/board.c rename to ports/nordic/boards/sparkfun_nrf52840_mini/board.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.h b/ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.h rename to ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.h diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.mk b/ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.mk rename to ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.mk diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/pins.c b/ports/nordic/boards/sparkfun_nrf52840_mini/pins.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/pins.c rename to ports/nordic/boards/sparkfun_nrf52840_mini/pins.c diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/board.c b/ports/nordic/boards/ssci_isp1807_dev_board/board.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/board.c rename to ports/nordic/boards/ssci_isp1807_dev_board/board.c diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.h b/ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.h rename to ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.h diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.mk b/ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.mk rename to ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.mk diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/pins.c b/ports/nordic/boards/ssci_isp1807_dev_board/pins.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/pins.c rename to ports/nordic/boards/ssci_isp1807_dev_board/pins.c diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/board.c b/ports/nordic/boards/ssci_isp1807_micro_board/board.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/board.c rename to ports/nordic/boards/ssci_isp1807_micro_board/board.c diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.h b/ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.h rename to ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.h diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.mk b/ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.mk rename to ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.mk diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/pins.c b/ports/nordic/boards/ssci_isp1807_micro_board/pins.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/pins.c rename to ports/nordic/boards/ssci_isp1807_micro_board/pins.c diff --git a/ports/nrf/boards/supermini_nrf52840/board.c b/ports/nordic/boards/supermini_nrf52840/board.c similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/board.c rename to ports/nordic/boards/supermini_nrf52840/board.c diff --git a/ports/nrf/boards/supermini_nrf52840/mpconfigboard.h b/ports/nordic/boards/supermini_nrf52840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/mpconfigboard.h rename to ports/nordic/boards/supermini_nrf52840/mpconfigboard.h diff --git a/ports/nrf/boards/supermini_nrf52840/mpconfigboard.mk b/ports/nordic/boards/supermini_nrf52840/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/mpconfigboard.mk rename to ports/nordic/boards/supermini_nrf52840/mpconfigboard.mk diff --git a/ports/nrf/boards/supermini_nrf52840/pins.c b/ports/nordic/boards/supermini_nrf52840/pins.c similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/pins.c rename to ports/nordic/boards/supermini_nrf52840/pins.c diff --git a/ports/nrf/boards/teknikio_bluebird/board.c b/ports/nordic/boards/teknikio_bluebird/board.c similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/board.c rename to ports/nordic/boards/teknikio_bluebird/board.c diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h b/ports/nordic/boards/teknikio_bluebird/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/mpconfigboard.h rename to ports/nordic/boards/teknikio_bluebird/mpconfigboard.h diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk b/ports/nordic/boards/teknikio_bluebird/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk rename to ports/nordic/boards/teknikio_bluebird/mpconfigboard.mk diff --git a/ports/nrf/boards/teknikio_bluebird/pins.c b/ports/nordic/boards/teknikio_bluebird/pins.c similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/pins.c rename to ports/nordic/boards/teknikio_bluebird/pins.c diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/README.md b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/README.md similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/README.md rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/README.md diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/board.c similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/board.c diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/pins.c b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/pins.c rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c diff --git a/ports/nrf/boards/warmbit_bluepixel/board.c b/ports/nordic/boards/warmbit_bluepixel/board.c similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/board.c rename to ports/nordic/boards/warmbit_bluepixel/board.c diff --git a/ports/nrf/boards/warmbit_bluepixel/mpconfigboard.h b/ports/nordic/boards/warmbit_bluepixel/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/mpconfigboard.h rename to ports/nordic/boards/warmbit_bluepixel/mpconfigboard.h diff --git a/ports/nrf/boards/warmbit_bluepixel/mpconfigboard.mk b/ports/nordic/boards/warmbit_bluepixel/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/mpconfigboard.mk rename to ports/nordic/boards/warmbit_bluepixel/mpconfigboard.mk diff --git a/ports/nrf/boards/warmbit_bluepixel/pins.c b/ports/nordic/boards/warmbit_bluepixel/pins.c similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/pins.c rename to ports/nordic/boards/warmbit_bluepixel/pins.c diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nordic/common-hal/_bleio/Adapter.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Adapter.c rename to ports/nordic/common-hal/_bleio/Adapter.c diff --git a/ports/nrf/common-hal/_bleio/Adapter.h b/ports/nordic/common-hal/_bleio/Adapter.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Adapter.h rename to ports/nordic/common-hal/_bleio/Adapter.h diff --git a/ports/nrf/common-hal/_bleio/Attribute.c b/ports/nordic/common-hal/_bleio/Attribute.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Attribute.c rename to ports/nordic/common-hal/_bleio/Attribute.c diff --git a/ports/nrf/common-hal/_bleio/Attribute.h b/ports/nordic/common-hal/_bleio/Attribute.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Attribute.h rename to ports/nordic/common-hal/_bleio/Attribute.h diff --git a/ports/nrf/common-hal/_bleio/Characteristic.c b/ports/nordic/common-hal/_bleio/Characteristic.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Characteristic.c rename to ports/nordic/common-hal/_bleio/Characteristic.c diff --git a/ports/nrf/common-hal/_bleio/Characteristic.h b/ports/nordic/common-hal/_bleio/Characteristic.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Characteristic.h rename to ports/nordic/common-hal/_bleio/Characteristic.h diff --git a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c b/ports/nordic/common-hal/_bleio/CharacteristicBuffer.c similarity index 100% rename from ports/nrf/common-hal/_bleio/CharacteristicBuffer.c rename to ports/nordic/common-hal/_bleio/CharacteristicBuffer.c diff --git a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.h b/ports/nordic/common-hal/_bleio/CharacteristicBuffer.h similarity index 100% rename from ports/nrf/common-hal/_bleio/CharacteristicBuffer.h rename to ports/nordic/common-hal/_bleio/CharacteristicBuffer.h diff --git a/ports/nrf/common-hal/_bleio/Connection.c b/ports/nordic/common-hal/_bleio/Connection.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Connection.c rename to ports/nordic/common-hal/_bleio/Connection.c diff --git a/ports/nrf/common-hal/_bleio/Connection.h b/ports/nordic/common-hal/_bleio/Connection.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Connection.h rename to ports/nordic/common-hal/_bleio/Connection.h diff --git a/ports/nrf/common-hal/_bleio/Descriptor.c b/ports/nordic/common-hal/_bleio/Descriptor.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Descriptor.c rename to ports/nordic/common-hal/_bleio/Descriptor.c diff --git a/ports/nrf/common-hal/_bleio/Descriptor.h b/ports/nordic/common-hal/_bleio/Descriptor.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Descriptor.h rename to ports/nordic/common-hal/_bleio/Descriptor.h diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.c b/ports/nordic/common-hal/_bleio/PacketBuffer.c similarity index 100% rename from ports/nrf/common-hal/_bleio/PacketBuffer.c rename to ports/nordic/common-hal/_bleio/PacketBuffer.c diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.h b/ports/nordic/common-hal/_bleio/PacketBuffer.h similarity index 100% rename from ports/nrf/common-hal/_bleio/PacketBuffer.h rename to ports/nordic/common-hal/_bleio/PacketBuffer.h diff --git a/ports/nrf/common-hal/_bleio/Service.c b/ports/nordic/common-hal/_bleio/Service.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Service.c rename to ports/nordic/common-hal/_bleio/Service.c diff --git a/ports/nrf/common-hal/_bleio/Service.h b/ports/nordic/common-hal/_bleio/Service.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Service.h rename to ports/nordic/common-hal/_bleio/Service.h diff --git a/ports/nrf/common-hal/_bleio/UUID.c b/ports/nordic/common-hal/_bleio/UUID.c similarity index 100% rename from ports/nrf/common-hal/_bleio/UUID.c rename to ports/nordic/common-hal/_bleio/UUID.c diff --git a/ports/nrf/common-hal/_bleio/UUID.h b/ports/nordic/common-hal/_bleio/UUID.h similarity index 100% rename from ports/nrf/common-hal/_bleio/UUID.h rename to ports/nordic/common-hal/_bleio/UUID.h diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nordic/common-hal/_bleio/__init__.c similarity index 100% rename from ports/nrf/common-hal/_bleio/__init__.c rename to ports/nordic/common-hal/_bleio/__init__.c diff --git a/ports/nrf/common-hal/_bleio/__init__.h b/ports/nordic/common-hal/_bleio/__init__.h similarity index 100% rename from ports/nrf/common-hal/_bleio/__init__.h rename to ports/nordic/common-hal/_bleio/__init__.h diff --git a/ports/nrf/common-hal/_bleio/bonding.c b/ports/nordic/common-hal/_bleio/bonding.c similarity index 100% rename from ports/nrf/common-hal/_bleio/bonding.c rename to ports/nordic/common-hal/_bleio/bonding.c diff --git a/ports/nrf/common-hal/_bleio/bonding.h b/ports/nordic/common-hal/_bleio/bonding.h similarity index 100% rename from ports/nrf/common-hal/_bleio/bonding.h rename to ports/nordic/common-hal/_bleio/bonding.h diff --git a/ports/nrf/common-hal/alarm/SleepMemory.c b/ports/nordic/common-hal/alarm/SleepMemory.c similarity index 100% rename from ports/nrf/common-hal/alarm/SleepMemory.c rename to ports/nordic/common-hal/alarm/SleepMemory.c diff --git a/ports/nrf/common-hal/alarm/SleepMemory.h b/ports/nordic/common-hal/alarm/SleepMemory.h similarity index 100% rename from ports/nrf/common-hal/alarm/SleepMemory.h rename to ports/nordic/common-hal/alarm/SleepMemory.h diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nordic/common-hal/alarm/__init__.c similarity index 100% rename from ports/nrf/common-hal/alarm/__init__.c rename to ports/nordic/common-hal/alarm/__init__.c diff --git a/ports/nrf/common-hal/alarm/__init__.h b/ports/nordic/common-hal/alarm/__init__.h similarity index 100% rename from ports/nrf/common-hal/alarm/__init__.h rename to ports/nordic/common-hal/alarm/__init__.h diff --git a/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c b/ports/nordic/common-hal/alarm/coproc/CoprocAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c rename to ports/nordic/common-hal/alarm/coproc/CoprocAlarm.c diff --git a/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h b/ports/nordic/common-hal/alarm/coproc/CoprocAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h rename to ports/nordic/common-hal/alarm/coproc/CoprocAlarm.h diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.c b/ports/nordic/common-hal/alarm/pin/PinAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/pin/PinAlarm.c rename to ports/nordic/common-hal/alarm/pin/PinAlarm.c diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.h b/ports/nordic/common-hal/alarm/pin/PinAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/pin/PinAlarm.h rename to ports/nordic/common-hal/alarm/pin/PinAlarm.h diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.c b/ports/nordic/common-hal/alarm/time/TimeAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/time/TimeAlarm.c rename to ports/nordic/common-hal/alarm/time/TimeAlarm.c diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.h b/ports/nordic/common-hal/alarm/time/TimeAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/time/TimeAlarm.h rename to ports/nordic/common-hal/alarm/time/TimeAlarm.h diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.c b/ports/nordic/common-hal/alarm/touch/TouchAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/touch/TouchAlarm.c rename to ports/nordic/common-hal/alarm/touch/TouchAlarm.c diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.h b/ports/nordic/common-hal/alarm/touch/TouchAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/touch/TouchAlarm.h rename to ports/nordic/common-hal/alarm/touch/TouchAlarm.h diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nordic/common-hal/analogio/AnalogIn.c similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogIn.c rename to ports/nordic/common-hal/analogio/AnalogIn.c diff --git a/ports/nrf/common-hal/analogio/AnalogIn.h b/ports/nordic/common-hal/analogio/AnalogIn.h similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogIn.h rename to ports/nordic/common-hal/analogio/AnalogIn.h diff --git a/ports/nrf/common-hal/analogio/AnalogOut.c b/ports/nordic/common-hal/analogio/AnalogOut.c similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogOut.c rename to ports/nordic/common-hal/analogio/AnalogOut.c diff --git a/ports/nrf/common-hal/analogio/AnalogOut.h b/ports/nordic/common-hal/analogio/AnalogOut.h similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogOut.h rename to ports/nordic/common-hal/analogio/AnalogOut.h diff --git a/ports/nrf/common-hal/analogio/__init__.c b/ports/nordic/common-hal/analogio/__init__.c similarity index 100% rename from ports/nrf/common-hal/analogio/__init__.c rename to ports/nordic/common-hal/analogio/__init__.c diff --git a/ports/nrf/common-hal/audiobusio/I2SOut.c b/ports/nordic/common-hal/audiobusio/I2SOut.c similarity index 100% rename from ports/nrf/common-hal/audiobusio/I2SOut.c rename to ports/nordic/common-hal/audiobusio/I2SOut.c diff --git a/ports/nrf/common-hal/audiobusio/I2SOut.h b/ports/nordic/common-hal/audiobusio/I2SOut.h similarity index 100% rename from ports/nrf/common-hal/audiobusio/I2SOut.h rename to ports/nordic/common-hal/audiobusio/I2SOut.h diff --git a/ports/nrf/common-hal/audiobusio/PDMIn.c b/ports/nordic/common-hal/audiobusio/PDMIn.c similarity index 100% rename from ports/nrf/common-hal/audiobusio/PDMIn.c rename to ports/nordic/common-hal/audiobusio/PDMIn.c diff --git a/ports/nrf/common-hal/audiobusio/PDMIn.h b/ports/nordic/common-hal/audiobusio/PDMIn.h similarity index 100% rename from ports/nrf/common-hal/audiobusio/PDMIn.h rename to ports/nordic/common-hal/audiobusio/PDMIn.h diff --git a/ports/nrf/common-hal/audiobusio/__init__.c b/ports/nordic/common-hal/audiobusio/__init__.c similarity index 100% rename from ports/nrf/common-hal/audiobusio/__init__.c rename to ports/nordic/common-hal/audiobusio/__init__.c diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c b/ports/nordic/common-hal/audiopwmio/PWMAudioOut.c similarity index 100% rename from ports/nrf/common-hal/audiopwmio/PWMAudioOut.c rename to ports/nordic/common-hal/audiopwmio/PWMAudioOut.c diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.h b/ports/nordic/common-hal/audiopwmio/PWMAudioOut.h similarity index 100% rename from ports/nrf/common-hal/audiopwmio/PWMAudioOut.h rename to ports/nordic/common-hal/audiopwmio/PWMAudioOut.h diff --git a/ports/nrf/common-hal/audiopwmio/__init__.c b/ports/nordic/common-hal/audiopwmio/__init__.c similarity index 100% rename from ports/nrf/common-hal/audiopwmio/__init__.c rename to ports/nordic/common-hal/audiopwmio/__init__.c diff --git a/ports/nrf/common-hal/board/__init__.c b/ports/nordic/common-hal/board/__init__.c similarity index 100% rename from ports/nrf/common-hal/board/__init__.c rename to ports/nordic/common-hal/board/__init__.c diff --git a/ports/nrf/common-hal/busio/I2C.c b/ports/nordic/common-hal/busio/I2C.c similarity index 100% rename from ports/nrf/common-hal/busio/I2C.c rename to ports/nordic/common-hal/busio/I2C.c diff --git a/ports/nrf/common-hal/busio/I2C.h b/ports/nordic/common-hal/busio/I2C.h similarity index 100% rename from ports/nrf/common-hal/busio/I2C.h rename to ports/nordic/common-hal/busio/I2C.h diff --git a/ports/nrf/common-hal/busio/SPI.c b/ports/nordic/common-hal/busio/SPI.c similarity index 100% rename from ports/nrf/common-hal/busio/SPI.c rename to ports/nordic/common-hal/busio/SPI.c diff --git a/ports/nrf/common-hal/busio/SPI.h b/ports/nordic/common-hal/busio/SPI.h similarity index 100% rename from ports/nrf/common-hal/busio/SPI.h rename to ports/nordic/common-hal/busio/SPI.h diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nordic/common-hal/busio/UART.c similarity index 100% rename from ports/nrf/common-hal/busio/UART.c rename to ports/nordic/common-hal/busio/UART.c diff --git a/ports/nrf/common-hal/busio/UART.h b/ports/nordic/common-hal/busio/UART.h similarity index 100% rename from ports/nrf/common-hal/busio/UART.h rename to ports/nordic/common-hal/busio/UART.h diff --git a/ports/nrf/common-hal/busio/__init__.c b/ports/nordic/common-hal/busio/__init__.c similarity index 100% rename from ports/nrf/common-hal/busio/__init__.c rename to ports/nordic/common-hal/busio/__init__.c diff --git a/ports/nrf/common-hal/countio/Counter.c b/ports/nordic/common-hal/countio/Counter.c similarity index 100% rename from ports/nrf/common-hal/countio/Counter.c rename to ports/nordic/common-hal/countio/Counter.c diff --git a/ports/nrf/common-hal/countio/Counter.h b/ports/nordic/common-hal/countio/Counter.h similarity index 100% rename from ports/nrf/common-hal/countio/Counter.h rename to ports/nordic/common-hal/countio/Counter.h diff --git a/ports/nrf/common-hal/countio/__init__.c b/ports/nordic/common-hal/countio/__init__.c similarity index 100% rename from ports/nrf/common-hal/countio/__init__.c rename to ports/nordic/common-hal/countio/__init__.c diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.c b/ports/nordic/common-hal/digitalio/DigitalInOut.c similarity index 100% rename from ports/nrf/common-hal/digitalio/DigitalInOut.c rename to ports/nordic/common-hal/digitalio/DigitalInOut.c diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.h b/ports/nordic/common-hal/digitalio/DigitalInOut.h similarity index 100% rename from ports/nrf/common-hal/digitalio/DigitalInOut.h rename to ports/nordic/common-hal/digitalio/DigitalInOut.h diff --git a/ports/nrf/common-hal/digitalio/__init__.c b/ports/nordic/common-hal/digitalio/__init__.c similarity index 100% rename from ports/nrf/common-hal/digitalio/__init__.c rename to ports/nordic/common-hal/digitalio/__init__.c diff --git a/ports/nrf/common-hal/memorymap/AddressRange.c b/ports/nordic/common-hal/memorymap/AddressRange.c similarity index 100% rename from ports/nrf/common-hal/memorymap/AddressRange.c rename to ports/nordic/common-hal/memorymap/AddressRange.c diff --git a/ports/nrf/common-hal/memorymap/AddressRange.h b/ports/nordic/common-hal/memorymap/AddressRange.h similarity index 100% rename from ports/nrf/common-hal/memorymap/AddressRange.h rename to ports/nordic/common-hal/memorymap/AddressRange.h diff --git a/ports/nrf/common-hal/memorymap/__init__.c b/ports/nordic/common-hal/memorymap/__init__.c similarity index 100% rename from ports/nrf/common-hal/memorymap/__init__.c rename to ports/nordic/common-hal/memorymap/__init__.c diff --git a/ports/nrf/common-hal/microcontroller/Pin.c b/ports/nordic/common-hal/microcontroller/Pin.c similarity index 100% rename from ports/nrf/common-hal/microcontroller/Pin.c rename to ports/nordic/common-hal/microcontroller/Pin.c diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nordic/common-hal/microcontroller/Pin.h similarity index 100% rename from ports/nrf/common-hal/microcontroller/Pin.h rename to ports/nordic/common-hal/microcontroller/Pin.h diff --git a/ports/nrf/common-hal/microcontroller/Processor.c b/ports/nordic/common-hal/microcontroller/Processor.c similarity index 100% rename from ports/nrf/common-hal/microcontroller/Processor.c rename to ports/nordic/common-hal/microcontroller/Processor.c diff --git a/ports/nrf/common-hal/microcontroller/Processor.h b/ports/nordic/common-hal/microcontroller/Processor.h similarity index 100% rename from ports/nrf/common-hal/microcontroller/Processor.h rename to ports/nordic/common-hal/microcontroller/Processor.h diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nordic/common-hal/microcontroller/__init__.c similarity index 100% rename from ports/nrf/common-hal/microcontroller/__init__.c rename to ports/nordic/common-hal/microcontroller/__init__.c diff --git a/ports/nrf/common-hal/neopixel_write/__init__.c b/ports/nordic/common-hal/neopixel_write/__init__.c similarity index 100% rename from ports/nrf/common-hal/neopixel_write/__init__.c rename to ports/nordic/common-hal/neopixel_write/__init__.c diff --git a/ports/nrf/common-hal/neopixel_write/__init__.h b/ports/nordic/common-hal/neopixel_write/__init__.h similarity index 100% rename from ports/nrf/common-hal/neopixel_write/__init__.h rename to ports/nordic/common-hal/neopixel_write/__init__.h diff --git a/ports/nrf/common-hal/nvm/ByteArray.c b/ports/nordic/common-hal/nvm/ByteArray.c similarity index 100% rename from ports/nrf/common-hal/nvm/ByteArray.c rename to ports/nordic/common-hal/nvm/ByteArray.c diff --git a/ports/nrf/common-hal/nvm/ByteArray.h b/ports/nordic/common-hal/nvm/ByteArray.h similarity index 100% rename from ports/nrf/common-hal/nvm/ByteArray.h rename to ports/nordic/common-hal/nvm/ByteArray.h diff --git a/ports/nrf/common-hal/nvm/__init__.c b/ports/nordic/common-hal/nvm/__init__.c similarity index 100% rename from ports/nrf/common-hal/nvm/__init__.c rename to ports/nordic/common-hal/nvm/__init__.c diff --git a/ports/nrf/common-hal/os/__init__.c b/ports/nordic/common-hal/os/__init__.c similarity index 100% rename from ports/nrf/common-hal/os/__init__.c rename to ports/nordic/common-hal/os/__init__.c diff --git a/ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c b/ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c similarity index 100% rename from ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c rename to ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c diff --git a/ports/nrf/common-hal/paralleldisplaybus/ParallelBus.h b/ports/nordic/common-hal/paralleldisplaybus/ParallelBus.h similarity index 100% rename from ports/nrf/common-hal/paralleldisplaybus/ParallelBus.h rename to ports/nordic/common-hal/paralleldisplaybus/ParallelBus.h diff --git a/ports/nrf/common-hal/pulseio/PulseIn.c b/ports/nordic/common-hal/pulseio/PulseIn.c similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseIn.c rename to ports/nordic/common-hal/pulseio/PulseIn.c diff --git a/ports/nrf/common-hal/pulseio/PulseIn.h b/ports/nordic/common-hal/pulseio/PulseIn.h similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseIn.h rename to ports/nordic/common-hal/pulseio/PulseIn.h diff --git a/ports/nrf/common-hal/pulseio/PulseOut.c b/ports/nordic/common-hal/pulseio/PulseOut.c similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseOut.c rename to ports/nordic/common-hal/pulseio/PulseOut.c diff --git a/ports/nrf/common-hal/pulseio/PulseOut.h b/ports/nordic/common-hal/pulseio/PulseOut.h similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseOut.h rename to ports/nordic/common-hal/pulseio/PulseOut.h diff --git a/ports/nrf/common-hal/pulseio/__init__.c b/ports/nordic/common-hal/pulseio/__init__.c similarity index 100% rename from ports/nrf/common-hal/pulseio/__init__.c rename to ports/nordic/common-hal/pulseio/__init__.c diff --git a/ports/nrf/common-hal/pwmio/PWMOut.c b/ports/nordic/common-hal/pwmio/PWMOut.c similarity index 100% rename from ports/nrf/common-hal/pwmio/PWMOut.c rename to ports/nordic/common-hal/pwmio/PWMOut.c diff --git a/ports/nrf/common-hal/pwmio/PWMOut.h b/ports/nordic/common-hal/pwmio/PWMOut.h similarity index 100% rename from ports/nrf/common-hal/pwmio/PWMOut.h rename to ports/nordic/common-hal/pwmio/PWMOut.h diff --git a/ports/nrf/common-hal/pwmio/__init__.c b/ports/nordic/common-hal/pwmio/__init__.c similarity index 100% rename from ports/nrf/common-hal/pwmio/__init__.c rename to ports/nordic/common-hal/pwmio/__init__.c diff --git a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.c b/ports/nordic/common-hal/rgbmatrix/RGBMatrix.c similarity index 100% rename from ports/nrf/common-hal/rgbmatrix/RGBMatrix.c rename to ports/nordic/common-hal/rgbmatrix/RGBMatrix.c diff --git a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h b/ports/nordic/common-hal/rgbmatrix/RGBMatrix.h similarity index 100% rename from ports/nrf/common-hal/rgbmatrix/RGBMatrix.h rename to ports/nordic/common-hal/rgbmatrix/RGBMatrix.h diff --git a/ports/nrf/common-hal/rgbmatrix/__init__.c b/ports/nordic/common-hal/rgbmatrix/__init__.c similarity index 100% rename from ports/nrf/common-hal/rgbmatrix/__init__.c rename to ports/nordic/common-hal/rgbmatrix/__init__.c diff --git a/ports/nrf/common-hal/rotaryio/IncrementalEncoder.c b/ports/nordic/common-hal/rotaryio/IncrementalEncoder.c similarity index 100% rename from ports/nrf/common-hal/rotaryio/IncrementalEncoder.c rename to ports/nordic/common-hal/rotaryio/IncrementalEncoder.c diff --git a/ports/nrf/common-hal/rotaryio/IncrementalEncoder.h b/ports/nordic/common-hal/rotaryio/IncrementalEncoder.h similarity index 100% rename from ports/nrf/common-hal/rotaryio/IncrementalEncoder.h rename to ports/nordic/common-hal/rotaryio/IncrementalEncoder.h diff --git a/ports/nrf/common-hal/rotaryio/__init__.c b/ports/nordic/common-hal/rotaryio/__init__.c similarity index 100% rename from ports/nrf/common-hal/rotaryio/__init__.c rename to ports/nordic/common-hal/rotaryio/__init__.c diff --git a/ports/nrf/common-hal/rtc/RTC.c b/ports/nordic/common-hal/rtc/RTC.c similarity index 100% rename from ports/nrf/common-hal/rtc/RTC.c rename to ports/nordic/common-hal/rtc/RTC.c diff --git a/ports/nrf/common-hal/rtc/RTC.h b/ports/nordic/common-hal/rtc/RTC.h similarity index 100% rename from ports/nrf/common-hal/rtc/RTC.h rename to ports/nordic/common-hal/rtc/RTC.h diff --git a/ports/nrf/common-hal/rtc/__init__.c b/ports/nordic/common-hal/rtc/__init__.c similarity index 100% rename from ports/nrf/common-hal/rtc/__init__.c rename to ports/nordic/common-hal/rtc/__init__.c diff --git a/ports/nrf/common-hal/supervisor/Runtime.c b/ports/nordic/common-hal/supervisor/Runtime.c similarity index 100% rename from ports/nrf/common-hal/supervisor/Runtime.c rename to ports/nordic/common-hal/supervisor/Runtime.c diff --git a/ports/nrf/common-hal/supervisor/Runtime.h b/ports/nordic/common-hal/supervisor/Runtime.h similarity index 100% rename from ports/nrf/common-hal/supervisor/Runtime.h rename to ports/nordic/common-hal/supervisor/Runtime.h diff --git a/ports/nrf/common-hal/supervisor/__init__.c b/ports/nordic/common-hal/supervisor/__init__.c similarity index 100% rename from ports/nrf/common-hal/supervisor/__init__.c rename to ports/nordic/common-hal/supervisor/__init__.c diff --git a/ports/nrf/common-hal/watchdog/WatchDogMode.c b/ports/nordic/common-hal/watchdog/WatchDogMode.c similarity index 100% rename from ports/nrf/common-hal/watchdog/WatchDogMode.c rename to ports/nordic/common-hal/watchdog/WatchDogMode.c diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.c b/ports/nordic/common-hal/watchdog/WatchDogTimer.c similarity index 100% rename from ports/nrf/common-hal/watchdog/WatchDogTimer.c rename to ports/nordic/common-hal/watchdog/WatchDogTimer.c diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.h b/ports/nordic/common-hal/watchdog/WatchDogTimer.h similarity index 100% rename from ports/nrf/common-hal/watchdog/WatchDogTimer.h rename to ports/nordic/common-hal/watchdog/WatchDogTimer.h diff --git a/ports/nrf/common-hal/watchdog/__init__.c b/ports/nordic/common-hal/watchdog/__init__.c similarity index 100% rename from ports/nrf/common-hal/watchdog/__init__.c rename to ports/nordic/common-hal/watchdog/__init__.c diff --git a/ports/nrf/common-hal/watchdog/__init__.h b/ports/nordic/common-hal/watchdog/__init__.h similarity index 100% rename from ports/nrf/common-hal/watchdog/__init__.h rename to ports/nordic/common-hal/watchdog/__init__.h diff --git a/ports/nrf/device/nrf52/startup_nrf52.c b/ports/nordic/device/nrf52/startup_nrf52.c similarity index 100% rename from ports/nrf/device/nrf52/startup_nrf52.c rename to ports/nordic/device/nrf52/startup_nrf52.c diff --git a/ports/nrf/device/nrf52/startup_nrf52833.c b/ports/nordic/device/nrf52/startup_nrf52833.c similarity index 100% rename from ports/nrf/device/nrf52/startup_nrf52833.c rename to ports/nordic/device/nrf52/startup_nrf52833.c diff --git a/ports/nrf/device/nrf52/startup_nrf52840.c b/ports/nordic/device/nrf52/startup_nrf52840.c similarity index 100% rename from ports/nrf/device/nrf52/startup_nrf52840.c rename to ports/nordic/device/nrf52/startup_nrf52840.c diff --git a/ports/nrf/espruino_dfu_private_key.pem b/ports/nordic/espruino_dfu_private_key.pem similarity index 100% rename from ports/nrf/espruino_dfu_private_key.pem rename to ports/nordic/espruino_dfu_private_key.pem diff --git a/ports/nrf/freeze/test.py b/ports/nordic/freeze/test.py similarity index 100% rename from ports/nrf/freeze/test.py rename to ports/nordic/freeze/test.py diff --git a/ports/nrf/gccollect.c b/ports/nordic/gccollect.c similarity index 100% rename from ports/nrf/gccollect.c rename to ports/nordic/gccollect.c diff --git a/ports/nrf/ld_defines.c b/ports/nordic/ld_defines.c similarity index 100% rename from ports/nrf/ld_defines.c rename to ports/nordic/ld_defines.c diff --git a/ports/nrf/mpconfigport.h b/ports/nordic/mpconfigport.h similarity index 100% rename from ports/nrf/mpconfigport.h rename to ports/nordic/mpconfigport.h diff --git a/ports/nrf/mpconfigport.mk b/ports/nordic/mpconfigport.mk similarity index 100% rename from ports/nrf/mpconfigport.mk rename to ports/nordic/mpconfigport.mk diff --git a/ports/nrf/mphalport.h b/ports/nordic/mphalport.h similarity index 100% rename from ports/nrf/mphalport.h rename to ports/nordic/mphalport.h diff --git a/ports/nrf/nrfx b/ports/nordic/nrfx similarity index 100% rename from ports/nrf/nrfx rename to ports/nordic/nrfx diff --git a/ports/nrf/nrfx_config.h b/ports/nordic/nrfx_config.h similarity index 100% rename from ports/nrf/nrfx_config.h rename to ports/nordic/nrfx_config.h diff --git a/ports/nrf/nrfx_glue.h b/ports/nordic/nrfx_glue.h similarity index 100% rename from ports/nrf/nrfx_glue.h rename to ports/nordic/nrfx_glue.h diff --git a/ports/nrf/nrfx_log.h b/ports/nordic/nrfx_log.h similarity index 100% rename from ports/nrf/nrfx_log.h rename to ports/nordic/nrfx_log.h diff --git a/ports/nrf/peripherals/nrf/cache.c b/ports/nordic/peripherals/nrf/cache.c similarity index 100% rename from ports/nrf/peripherals/nrf/cache.c rename to ports/nordic/peripherals/nrf/cache.c diff --git a/ports/nrf/peripherals/nrf/cache.h b/ports/nordic/peripherals/nrf/cache.h similarity index 100% rename from ports/nrf/peripherals/nrf/cache.h rename to ports/nordic/peripherals/nrf/cache.h diff --git a/ports/nrf/peripherals/nrf/clocks.c b/ports/nordic/peripherals/nrf/clocks.c similarity index 100% rename from ports/nrf/peripherals/nrf/clocks.c rename to ports/nordic/peripherals/nrf/clocks.c diff --git a/ports/nrf/peripherals/nrf/clocks.h b/ports/nordic/peripherals/nrf/clocks.h similarity index 100% rename from ports/nrf/peripherals/nrf/clocks.h rename to ports/nordic/peripherals/nrf/clocks.h diff --git a/ports/nrf/peripherals/nrf/nrf52833/pins.c b/ports/nordic/peripherals/nrf/nrf52833/pins.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52833/pins.c rename to ports/nordic/peripherals/nrf/nrf52833/pins.c diff --git a/ports/nrf/peripherals/nrf/nrf52833/pins.h b/ports/nordic/peripherals/nrf/nrf52833/pins.h similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52833/pins.h rename to ports/nordic/peripherals/nrf/nrf52833/pins.h diff --git a/ports/nrf/peripherals/nrf/nrf52833/power.c b/ports/nordic/peripherals/nrf/nrf52833/power.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52833/power.c rename to ports/nordic/peripherals/nrf/nrf52833/power.c diff --git a/ports/nrf/peripherals/nrf/nrf52840/pins.c b/ports/nordic/peripherals/nrf/nrf52840/pins.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52840/pins.c rename to ports/nordic/peripherals/nrf/nrf52840/pins.c diff --git a/ports/nrf/peripherals/nrf/nrf52840/pins.h b/ports/nordic/peripherals/nrf/nrf52840/pins.h similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52840/pins.h rename to ports/nordic/peripherals/nrf/nrf52840/pins.h diff --git a/ports/nrf/peripherals/nrf/nrf52840/power.c b/ports/nordic/peripherals/nrf/nrf52840/power.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52840/power.c rename to ports/nordic/peripherals/nrf/nrf52840/power.c diff --git a/ports/nrf/peripherals/nrf/nvm.c b/ports/nordic/peripherals/nrf/nvm.c similarity index 100% rename from ports/nrf/peripherals/nrf/nvm.c rename to ports/nordic/peripherals/nrf/nvm.c diff --git a/ports/nrf/peripherals/nrf/nvm.h b/ports/nordic/peripherals/nrf/nvm.h similarity index 100% rename from ports/nrf/peripherals/nrf/nvm.h rename to ports/nordic/peripherals/nrf/nvm.h diff --git a/ports/nrf/peripherals/nrf/pins.h b/ports/nordic/peripherals/nrf/pins.h similarity index 100% rename from ports/nrf/peripherals/nrf/pins.h rename to ports/nordic/peripherals/nrf/pins.h diff --git a/ports/nrf/peripherals/nrf/power.h b/ports/nordic/peripherals/nrf/power.h similarity index 100% rename from ports/nrf/peripherals/nrf/power.h rename to ports/nordic/peripherals/nrf/power.h diff --git a/ports/nrf/peripherals/nrf/timers.c b/ports/nordic/peripherals/nrf/timers.c similarity index 100% rename from ports/nrf/peripherals/nrf/timers.c rename to ports/nordic/peripherals/nrf/timers.c diff --git a/ports/nrf/peripherals/nrf/timers.h b/ports/nordic/peripherals/nrf/timers.h similarity index 100% rename from ports/nrf/peripherals/nrf/timers.h rename to ports/nordic/peripherals/nrf/timers.h diff --git a/ports/nrf/qstrdefsport.h b/ports/nordic/qstrdefsport.h similarity index 100% rename from ports/nrf/qstrdefsport.h rename to ports/nordic/qstrdefsport.h diff --git a/ports/nrf/sd_mutex.c b/ports/nordic/sd_mutex.c similarity index 100% rename from ports/nrf/sd_mutex.c rename to ports/nordic/sd_mutex.c diff --git a/ports/nrf/sd_mutex.h b/ports/nordic/sd_mutex.h similarity index 100% rename from ports/nrf/sd_mutex.h rename to ports/nordic/sd_mutex.h diff --git a/ports/nrf/supervisor/cpu.s b/ports/nordic/supervisor/cpu.s similarity index 100% rename from ports/nrf/supervisor/cpu.s rename to ports/nordic/supervisor/cpu.s diff --git a/ports/nrf/supervisor/internal_flash.c b/ports/nordic/supervisor/internal_flash.c similarity index 100% rename from ports/nrf/supervisor/internal_flash.c rename to ports/nordic/supervisor/internal_flash.c diff --git a/ports/nrf/supervisor/internal_flash.h b/ports/nordic/supervisor/internal_flash.h similarity index 100% rename from ports/nrf/supervisor/internal_flash.h rename to ports/nordic/supervisor/internal_flash.h diff --git a/ports/nrf/supervisor/port.c b/ports/nordic/supervisor/port.c similarity index 100% rename from ports/nrf/supervisor/port.c rename to ports/nordic/supervisor/port.c diff --git a/ports/nrf/supervisor/qspi_flash.c b/ports/nordic/supervisor/qspi_flash.c similarity index 100% rename from ports/nrf/supervisor/qspi_flash.c rename to ports/nordic/supervisor/qspi_flash.c diff --git a/ports/nrf/supervisor/qspi_flash.h b/ports/nordic/supervisor/qspi_flash.h similarity index 100% rename from ports/nrf/supervisor/qspi_flash.h rename to ports/nordic/supervisor/qspi_flash.h diff --git a/ports/nrf/supervisor/usb.c b/ports/nordic/supervisor/usb.c similarity index 100% rename from ports/nrf/supervisor/usb.c rename to ports/nordic/supervisor/usb.c diff --git a/ports/nrf/boards/electronut_labs_blip/README.md b/ports/nrf/boards/electronut_labs_blip/README.md deleted file mode 100644 index c34ef16f8ddba..0000000000000 --- a/ports/nrf/boards/electronut_labs_blip/README.md +++ /dev/null @@ -1,67 +0,0 @@ -# Setup - -The `Electronut Labs Blip` board is a development board based on the `nRF52840` SoC from -Nordic Semiconductors. It has a Black Magic Probe compatible programmer and debugger -built in, along with temperature/humidity sensor, ambient light intensity sensor, and -a 3-axis accelerometer. It can be used to prototype very low power devices. It also has -provision for an SD card slot, which makes it a complete and versatile development board. - -Schematic, datasheet, pin mapping etc. can be found over [here](https://docs.electronut.in/blip/). - -Features: - -* Raytac MDBT50Q-1M module based on Nordic Semiconductor's nRF52840 -* LIS2DDH12 High-performance 3-axis "femto" accelerometer -* Optical Sensor LTR-329ALS-01 -* Si7006-A20 I2C humidity and temperature sensor -* On board STM32F103CBT6 as Black magic probe debugger -* NFC Antenna -* MicroSD slot -* Power Supply: USB, JST connector for Li-ion/Li-po -* BQ24079 battery charging and power management IC - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -## Building and Flashing CircuitPython - -No special notes for this, follow `ports/nrf` generic `README.md`. - -### Flashing CircuitPython with GDB using on board Black magic probe debugger - -``` -$ cd ports/nrf -$ make V=1 SD=s140 SERIAL=/dev/ttyACM0 BOARD=electronut_labs_blip all -... -... -LINK build-electronut_labs_blip-s140/firmware.elf - -778588 bytes free in flash out of 1048576 bytes ( 1024.0 kb ). -228320 bytes free in ram for stack out of 245760 bytes ( 240.0 kb ). - -Create build-electronut_labs_blip-s140/firmware.bin -Create build-electronut_labs_blip-s140/firmware.hex -Create build-electronut_labs_blip-s140/firmware.uf2 -python3 ../../tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "build-electronut_labs_blip-s140/firmware.uf2" build-electronut_labs_blip-s140/firmware.hex -Converting to uf2, output size: 540160, start address: 0x26000 -Wrote 540160 bytes to build-electronut_labs_blip-s140/firmware.uf2. -``` - -Now you can use either `.hex` or `.elf` from the generated files inside -`build-electronut_labs_blip-s140` directory. Now you can use `arm-none-eabi-gdb` -to flash circuitpython on Blip. - -### Other tips - -Once circuitpython is running on your board, it will come up as a mass storage -device named `CIRCUITPY`, where you can drop in your python code. The file names -it looks for are `main.py`, `main.txt`, `code.py` or `code.txt`. diff --git a/ports/nrf/boards/electronut_labs_papyr/README.md b/ports/nrf/boards/electronut_labs_papyr/README.md deleted file mode 100644 index 7e5c43cc872d9..0000000000000 --- a/ports/nrf/boards/electronut_labs_papyr/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# Setup - -The `Electronut Labs Papyr` board is based on the `nRF52840` SoC from -Nordic Semiconductors. It has an e-ink display on it, along with a CR2477 -battery holder. - -Papyr can be programmed with the [`Adafruit nRF52 bootloader`](https://github.com/adafruit/Adafruit_nRF52_Bootloader) to - -Schematic, datasheet default pin mapping etc. can be found over [here](https://docs.electronut.in/papyr/). The default pin mapping can be found in the board directory. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -## Installing the Bootloader - -If the `Adafruit nRF52 bootloader` is installed on the board, then the -bootloader allows you to update the core CircuitPython firmware and internal -file system contents using serial, or USB CDC, or USB mass storage. - -On empty devices, the bootloader will need to be flashed once using a -HW debugger such as a Segger J-Link, or Blackmagicprobe -(or [Electronut labs Bumpy](https://docs.electronut.in/bumpy/)). - - -## Building and Flashing CircuitPython - -No special notes for this, follow `ports/nrf` generic `README.md`. - -### Flashing CircuitPython with MSC UF2 - -`uf2` file is generated last by `all` target. - -``` -$ cd ports/nrf -$ make V=1 SD=s140 SERIAL=/dev/ttyACM0 BOARD=electronut_labs_papyr all -... -... -python3 ../../tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "build-electronut_labs_papyr-s140/firmware.uf2" build-electronut_labs_papyr-s140/firmware.hex -Converting to uf2, output size: 536576, start address: 0x26000 -Wrote 536576 bytes to build-electronut_labs_papyr-s140/firmware.uf2 -``` - -Simply drag and drop firmware.uf2 to the MSC, the nrf52840 will blink fast and reset after done. - -### Other tips - -Once circuitpython is running on your board, it will come up as a mass storage -device named `CIRCUITPY`, where you can drop in your python code. The file names -it looks for are `main.py`, `main.txt`, `code.py` or `code.txt`. diff --git a/ports/nrf/boards/feather_nrf52840_express/README.md b/ports/nrf/boards/feather_nrf52840_express/README.md deleted file mode 100644 index 88a78a20fd911..0000000000000 --- a/ports/nrf/boards/feather_nrf52840_express/README.md +++ /dev/null @@ -1,201 +0,0 @@ -# Setup - -The `feather52840` board is currently based on the `PCA10056` development -board from Nordic Semiconductors, since commercial modules are not yet -available for the nRF52840. - -The difference between the `pca10056` and `feather52840` board support -packages is that no bootloader is present on the `pca10056` (a HW debugger -like a Segger J-Link is required to flash firmware images), whereas the -`feather52840` package uses a serial bootloader, with a slightly different -flash layout to account for the bootloader's presence. - -Both targets run on the same hardware and assume the same pinouts. - -The `feather52840` board support package will be updated at a later date -to reflect any pin changes in the final Feather form-factor HW. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -You then need to download the SD and Nordic SDK files via: - -> This script relies on `wget`, which must be available from the command line. - -``` -$ cd ports/nrf -$ ./bluetooth/download_ble_stack.sh -``` - -## Installing the Serial Bootloader - -The Adafruit nRF52840 Feather uses a serial bootloader that allows you to -update the core CircuitPython firmware and internal file system contents -using only a serial connection. - -On empty devices, the serial bootloader will need to be flashed once using a -HW debugger such as a Segger J-Link before the serial updater (`adafruit-nrfutil`) can -be used. - -### Install `nrfjprog` - -Before you can install the bootloader, you will first need to install the -`nrfjprog` tool from Nordic Semiconductors for your operating system. The -binary files can be downloaded via the following links: - -- [nRF5x toolset tar for Linux 32-bit v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-Linux32/52619) -- [nRF5x toolset tar for Linux 64-bit v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-Linux64/51388) -- [nRF5x toolset tar for OSX v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-OSX/53406) -- [nRF5x toolset installer for Windows v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-Win32/48768) - -You will then need to add the `nrfjprog` folder to your system `PATH` variable -so that it is available from the command line. The exact process for this is -OS specific, but on a POSIX type system like OS X or Linux, you can -temporarily add the location to your `PATH` environment variables as follows: - -``` -$ export PATH=$PATH:YOURPATHHERE/nRF5x-Command-Line-Tools_9_7_2_OSX/nrfjprog/ -``` - -You can test this by running the following command: - -``` -$ nrfjprog --version -nrfjprog version: 9.7.2 -JLinkARM.dll version: 6.20f -``` - -### Flash the USB CDC Bootloader with 'nrfjprog' - -> This operation only needs to be done once, and only on boards that don't - already have the serial bootloader installed. - -Firstly clone the [Adafruit_nRF52_Bootloader](https://github.com/adafruit/Adafruit_nRF52_Bootloader.git) and enter its directory - -``` -$ git clone https://github.com/adafruit/Adafruit_nRF52_Bootloader.git -$ cd Adafruit_nRF52_Bootloader -``` - -Once `nrfjprog` is installed and available in `PATH` you can flash your -board with the serial bootloader via the following command: - -``` -make BOARD=feather_nrf52840_express VERSION=latest flash -``` - -This should give you the following (or very similar) output, and you will see -a DFU blinky pattern on one of the board LEDs: - -``` -$ make BOARD=pca10056 VERSION=latest flash -Flashing: bin/pca10056/6.0.0r0/pca10056_bootloader_s140_6.0.0r0.hex -nrfjprog --program bin/pca10056/6.0.0r0/pca10056_bootloader_s140_6.0.0r0.hex --chiperase -f nrf52 --reset -Parsing hex file. -Erasing user available code and UICR flash areas. -Applying system reset. -Checking that the area to write is not protected. -Programming device. -Applying system reset. -Run. -``` - -From this point onward, you can now use a simple serial port for firmware -updates. - -Note: You can specify other version that are available in the directory `Adafruit_nRF52_Bootloader/bin/feather_nrf52840_express/` . The `VERSION=latest` will use the latest bootloader available. - -### IMPORTANT: Disable Mass Storage on PCA10056 J-Link - -The J-Link firmware on the PCA10056 implement USB Mass Storage, but this -causes a known conflict with reliable USB CDC serial port communication. In -order to use the serial bootloader, **you must disable MSD support on the -Segger J-Link**! - -To disable mass storage support, run the `JLinkExe` (or equivalent) command, -and send `MSDDisable`. (You can re-enable MSD support via `MSDEnable`): - -``` -$ JLinkExe -SEGGER J-Link Commander V6.20f (Compiled Oct 13 2017 17:20:01) -DLL version V6.20f, compiled Oct 13 2017 17:19:52 - -Connecting to J-Link via USB...O.K. -Firmware: J-Link OB-SAM3U128-V2-NordicSemi compiled Jul 24 2017 17:30:12 -Hardware version: V1.00 -S/N: 683947110 -VTref = 3.300V - - -Type "connect" to establish a target connection, '?' for help -J-Link>MSDDisable -Probe configured successfully. -J-Link>exit -``` - -## Building and Flashing CircuitPython - -### Installing `adafruit-nrfutil` - -run follow command to install [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil) from PyPi - -``` -$ pip3 install adafruit-nrfutil --user -``` - -### Flashing CircuitPython with USB CDC - -With the serial bootloader present on your board, you first need to force your -board into DFU mode by holding down BUTTON1 and RESETTING the board (with -BUTTON1 still pressed as you come out of reset). - -This will give you a **fast blinky DFU pattern** to indicate you are in DFU -mode. - -You can **build and flash** a CircuitPython binary via the following command: - -``` -$ make V=1 SD=s140 SERIAL=/dev/tty.usbmodem1411 BOARD=feather52840 all dfu-gen dfu-flash -``` - -This should give you the following results: - -``` -$make V=1 BOARD=feather52840 SD=s140 SERIAL=/dev/tty.usbmodem1411 dfu-gen dfu-flash -nrfutil dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application build-feather52840-s140/firmware.hex build-feather52840-s140/dfu-package.zip -Zip created at build-feather52840-s140/dfu-package.zip -nrfutil --verbose dfu serial --package build-feather52840-s140/dfu-package.zip -p /dev/ttyACM1 -b 115200 --singlebank -Upgrading target on /dev/ttyACM1 with DFU package /home/hathach/Dropbox/adafruit/circuitpython/ada_cp/ports/nrf/build-feather52840-s140/dfu-package.zip. Flow control is disabled, Single bank mode -Starting DFU upgrade of type 4, SoftDevice size: 0, bootloader size: 0, application size: 199840 -Sending DFU start packet -Sending DFU init packet -Sending firmware file -######################################################################################################################################################################################################################################################################################################################################################################################################### -Activating new firmware - -DFU upgrade took 8.50606513023s -Device programmed. -``` - -### Flashing CircuitPython with MSC UF2 - -uf2 file is generated last by `all` target - -``` -$ make V=1 SD=s140 SERIAL=/dev/tty.usbmodem1411 BOARD=feather52840 all -Create firmware.uf2 -../../tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "build-feather52840-s140/firmware.uf2" "build-feather52840-s140/firmware.hex" -Converting to uf2, output size: 392192, start address: 0x26000 -Wrote 392192 bytes to build-feather52840-s140/firmware.uf2. -``` - -Simply drag and drop firmware.uf2 to the MSC, the nrf52840 will blink fast and reset after done. diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/README.md b/ports/nrf/boards/makerdiary_nrf52840_mdk/README.md deleted file mode 100644 index f1ba8151ac719..0000000000000 --- a/ports/nrf/boards/makerdiary_nrf52840_mdk/README.md +++ /dev/null @@ -1,102 +0,0 @@ -# MakerDiary NRF52840 MDK - -Refer to https://github.com/makerdiary/nrf52840-mdk or -https://wiki.makerdiary.com/nrf52840-mdk/ for more details about the device. - -Notably, CircuitPython does not currently support QSPI external flash on NRF -devices, so neither does this port - the 64Mb flash device is not used for -anything. Also, don't confuse this with the 64MiB drive that shows up on your -computer - it's actually part of the MSC driver provided by the DAPLink -debugger, and is inaccessible at all from Python land (this drive is where you -can copy `firmware.hex` if you'd prefer to flash that way as opposed to with -`pyocd`. You'll still have access to 256KB of the onboard flash, however, for -storing your Python files, cat pictures, or whatever. - -It's also interesting to note that all three LEDs and the "user button" on this -device are wired through sinks, not sources, so flip your boolean expectations -when dealing with `digitalio.DigitalInOut` on this device - `my_led.value = -True` turns the LED off! Likewise, the user button will read `False` when -pressed. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -You then need to download the SD and Nordic SDK files via: - -> This script relies on `wget`, which must be available from the command line. - -``` -$ cd ports/nrf -$ ./drivers/bluetooth/download_ble_stack.sh -``` - -## Note about bootloaders - -While most Adafruit devices come with (or can easily be flashed with) an -Adafruit-provided bootloader (supporting niceties like UF2 flashing), this -board comes with DAPLink which (apparently?) handles everything from debugging -to programming the device, as well as the boot sequence. What's particularly -awesome about this board is that there is no physical interaction with the board -required to flash new code (read: CircuitPython builds) - the device is _always_ -listening for new firmware uploads (via `pyocd-flashtool`), even if userspace -code is running. - -## Building and Flashing CircuitPython - -You'll need to have [pyocd](https://github.com/mbedmicro/pyOCD) installed as -appropriate for your system. - -```sh -make BOARD=makerdiary_nrf52840_mdk FLASHER=pyocd SD=s140 flash -``` - -This should give you the following (or very similar) output, and you will see -a DFU blinky pattern on one of the board LEDs: - -``` -$ make BOARD=makerdiary_nrf52840_mdk FLASHER=pyocd SD=s140 flash -Use make V=1, make V=2 or set BUILD_VERBOSE similarly in your environment to increase build verbosity. -pyocd-flashtool -t nrf52 build-makerdiary_nrf52840_mdk-s140/firmware.hex --sector_erase -INFO:root:DAP SWD MODE initialised -INFO:root:ROM table #0 @ 0xe00ff000 cidr=b105100d pidr=2002c4008 -INFO:root:[0] -WARNING:root:Invalid coresight component, cidr=0x0 -INFO:root:[1] -INFO:root:[2] -WARNING:root:Invalid coresight component, cidr=0x1010101 -INFO:root:[3] -WARNING:root:Invalid coresight component, cidr=0x0 -INFO:root:[4] -INFO:root:[5] -INFO:root:CPU core is Cortex-M4 -INFO:root:FPU present -INFO:root:6 hardware breakpoints, 4 literal comparators -INFO:root:4 hardware watchpoints -[====================] 100% -INFO:root:Programmed 237568 bytes (58 pages) at 14.28 kB/s -#pyocd-tool -t nrf52 erase 0xFF000 -pyocd-tool -t nrf52 write32 0xFF000 0x00000001 -WARNING:root:Invalid coresight component, cidr=0x0 -WARNING:root:Invalid coresight component, cidr=0x1010101 -WARNING:root:Invalid coresight component, cidr=0x0 -pyocd-tool -t nrf52 reset -WARNING:root:Invalid coresight component, cidr=0x0 -WARNING:root:Invalid coresight component, cidr=0x1010101 -WARNING:root:Invalid coresight component, cidr=0x0 -Resetting target -``` - -Alternatively (and untested by me), it's apparently possible to copy -`firmware.hex` to the MSC device provided by DAPLink and flash that way. Refer -to [the upstream -documentation](https://wiki.makerdiary.com/nrf52840-mdk/getting-started/#drag-n-drop-programming) -for details. diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/README.md b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/README.md deleted file mode 100644 index e3e50f905dca0..0000000000000 --- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/README.md +++ /dev/null @@ -1,96 +0,0 @@ -# MakerDiary NRF52840 MDK USB Dongle - -Refer to [The makerdiary Github repo](https://github.com/makerdiary/nrf52840-mdk-usb-dongle) -or [The nrf52840-mdk-usb-dongle wiki](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/) -for more details about the device. - -This is pretty much just the nRF52840 with a useful number of pins exposed for -your pleasure along with one RGB LED and an onboard antenna in a USB stick form -factor with room for headers on the sides. - -Note that all three LEDs on this device are wired through sinks, not sources, -so flip your boolean expectations when dealing with `DigitalInOut` or `PWMOut` -on this device -- -`led.value = True` or `led.duty_cycle = 0xffff` turns the LED off! - -The onboard button is hard wired to the Reset pin so you cannot use it yourself. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -## Note about bootloaders - -While most Adafruit devices come with (or can easily be flashed with) an -Adafruit-provided bootloader (supporting niceties like UF2 flashing), this -board comes with one that supports DFU via nrfutil. If you ever need to -restore the DFU bootloader via a SWD debugger, use -[the nRF52 open bootloader hex file](https://github.com/makerdiary/nrf52840-mdk-usb-dongle/tree/master/firmware/open_bootloader). - -## Building and Flashing CircuitPython - -``` -$ cd ports/nrf -``` - -### Build CircuitPython for the MDK USB Dongle - -``` -make BOARD=makerdiary_nrf52840_mdk_usb_dongle SD=s140 V=1 -j4 hex -``` - -This should produce a `build-makerdiary_nrf52840_mdk_usb_dongle-s140/firmware.hex` file. - -### Install nrfutil - -You'll need to have [nrfutil](https://pypi.org/project/nrfutil/) installed as -appropriate for your system. -As of 2019-01, _nrfutil still requires Python 2.7_... ugh! - -### Flash the nRF52 Radio Soft Device - -Build a DFU package from the softdevice hex file and flash it: - -```sh -nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xAE --softdevice bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex dfu_sd140-6.1.0.zip -nrfutil dfu usb-serial -pkg dfu_sd140-6.1.0.zip -p /dev/tty.usbmodemABRACADBRA # likely /dev/ttyACM0 on Linux -``` - -Note that the `--sd=id 0xAE` comes from the Nordic nRF52 manual for SoftDevice -6.1.0. When the SoftDevice is changed, read the Nordic manual to find the -correct value and use it on all of the `nrfutil pkg generate` commands. - -`/dev/tty.usbmodem*` is a macOS name. On Linux it'll likely be `/dev/ttyACM*`. On Windows probably a COM port. - -### Flash CircuitPython - -Build a DFU package from the hex application file and flash it: - -``` -nrfutil pkg generate --sd-req 0xAE --application build-makerdiary_nrf52840_mdk_usb_dongle-s140/firmware.hex --hw-version 52 --application-version 1 dfu_circuitpython.zip -nrfutil dfu usb-serial -pkg dfu_circuitpython.zip -p /dev/tty.usbmodemABRACADBRA -``` - -I'm not sure if `--application-version 1` is actually meaningful or required. - -After this, your device should be up and running CircuitPython. When it -resets, you'll see the CIRCUITPY USB filesystem and a new console usb modem -serial port show up. - -``` -Adafruit CircuitPython 4.0.0-alpha.5-139-g10ceb6716 on 2019-01-14; MakerDiary nRF52840 MDK USB Dongle with nRF52840 ->>> -``` - -### TODO items - -* Update the Makefile to do the above DFU .zip building and nrfutil flashing. -* Create a UF2 bootloader for this. It is already a USB stick form factor, it deserves to behave like one. diff --git a/ports/nrf/boards/pctel_wsc_1450/README.md b/ports/nrf/boards/pctel_wsc_1450/README.md deleted file mode 100644 index 91458108e3a55..0000000000000 --- a/ports/nrf/boards/pctel_wsc_1450/README.md +++ /dev/null @@ -1,51 +0,0 @@ -# PCTEL WSC-1450 - -The PCTEL Wireless Sensor Core (WSC) is a versatile Industrial IoT product line -that offers multiple radio connectivity options including cellular, LoRa, -Bluetooth 5, NFC as well as 802.15.4 support. - -In addition to several radios, the PCTEL WSC includes several sensors to -monitor a variety of physical conditions. These sensors can detect gas, air -quality, temperature, relative humidity, acceleration, angular rate of change, -magnetic field, range, and sound. For solution optimization, the PCTEL WSC can -be ordered with a subset of radios and sensors. - -For more details about this board, and its variants, navigate to -https://pctel.com - -# Build instructions - -Configure your build environment according to the Adafruit instructions. To -build circuitpython for WSC-1450 do: - - cd ports/nrf make BOARD=pctel_wsc_1450 - -This will create a number of firmware files in the `build-pctel_wsc_1450` -directory. - - -# Installing - -The WSC-1450 do not feature an Adafruit-provided bootloader (supporting -niceties like UF2 flashing). Instead, WSC-1450 uses DAPLink. DAPLink handles -everything from debugging to programming the device, as well as the boot -sequence. - -1. Connect the WSC-1450 dev kit using a USB cable to the `DHD USB` port. This - will power up the board and open a file browser showing the contents of the -target. (DAPlink magic) -2. Copy the newly built firmware to the WSC-1450 target using drag-n-drop or - other method. The file to upload is -`circuitpython/ports/nrf/build-pctel_wsc_1450/firmware.combined.hex` -3. Wait for the file to upload. -4. Install is complete. Reset the board. - -# Running - -Connect an additional USB cable to the `Target USB` port on the development -board and open a terminal like `screen` on Mac or `TeraTerm` on Windows. Serial -settings are 115200,n,8,1. - -Don't forget to install/update the supporting python libraries. - -Happy hacking. diff --git a/ports/nrf/boards/pitaya_go/README.md b/ports/nrf/boards/pitaya_go/README.md deleted file mode 100644 index a58b752892104..0000000000000 --- a/ports/nrf/boards/pitaya_go/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# Makerdiary Pitaya Go - ->Pitaya Go is a compact and versatile development platform for IoT solutions, -combining the Nordic's high-end multiprotocol SoC nRF52840 and the Microchip's -extreme low power Wi-Fi® network controller ATWINC1500B. It offers a complete -solution for wireless connectivity with IEEE 802.11 b/g/n, Bluetooth 5, Thread -and Zigbee, that is specifically designed for the IoT. -Pitaya Go features a Battery Charger with power path management, 64Mbit ultra -low power QSPI Flash memory, additional NFC-A Tag PCB Antenna, user -programmable RGB LED and Buttons, reversible USB-C Connector and easily -expandable Header Sockets. All these features above make this board an ideal -choice for the next IoT project. - -from [Makerdiary](https://store.makerdiary.com/products/pitaya-go) - - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - - -## Building -```sh -$ cd ports/nrf -$ make BOARD=pitaya_go SD=s140 -V=1 -j4 -``` - -# Flashing CircuitPython - -The Pitaya Go has a pre-programmed bootloader which can be used to program the -Pitaya Go. Follow [the guide - How to Program Pitaya Go](https://wiki.makerdiary.com/pitaya-go/programming/) -to flash the CircuitPython firmware. diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 9867b97c97cf3..77dafd4424d4b 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -26,7 +26,7 @@ // This file contains settings that are common across CircuitPython ports, to make // sure that the same feature set and settings are used, such as in atmel-samd -// and nrf. +// and nordic. #ifndef __INCLUDED_MPCONFIG_CIRCUITPY_H #define __INCLUDED_MPCONFIG_CIRCUITPY_H diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c index 2c2bb973277c3..0dafcf9bbf0cc 100644 --- a/shared-bindings/alarm/touch/TouchAlarm.c +++ b/shared-bindings/alarm/touch/TouchAlarm.c @@ -40,7 +40,7 @@ //| :param microcontroller.Pin pin: The pin to monitor. On some ports, the choice of pin //| may be limited due to hardware restrictions, particularly for deep-sleep alarms. //| -//| **Limitations:** Not available on SAMD, nRF, or RP2040. +//| **Limitations:** Not available on SAMD, Nordic, or RP2040. //| """ //| ... STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type, diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c index 0c6ca73670237..19c4340e2dc06 100644 --- a/shared-bindings/analogio/AnalogOut.c +++ b/shared-bindings/analogio/AnalogOut.c @@ -38,7 +38,7 @@ //| class AnalogOut: //| """Output analog values (a specific voltage). //| -//| **Limitations:** Not available on nRF, RP2040, Spresense, as there is no on-chip DAC. +//| **Limitations:** Not available on Nordic, RP2040, Spresense, as there is no on-chip DAC. //| On Espressif, available only on ESP32 and ESP32-S2; other chips do not have a DAC. //| //| Example usage:: diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 946dfa3d9039d..f0c4a92b3f320 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -97,7 +97,7 @@ //| *New in CircuitPython 4.0:* ``timeout`` has incompatibly changed units from milliseconds to seconds. //| The new upper limit on ``timeout`` is meant to catch mistaken use of milliseconds. //| -//| **Limitations:** RS485 is not supported on SAMD, nRF, Broadcom, Spresense, or STM. +//| **Limitations:** RS485 is not supported on SAMD, Nordic, Broadcom, Spresense, or STM. //| On i.MX and Raspberry Pi RP2040, RS485 support is implemented in software: //| The timing for the ``rs485_dir`` pin signal is done on a best-effort basis, and may not meet //| RS485 specifications intermittently. diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c index 6384f2ea704c1..9445d4fb0e477 100644 --- a/shared-bindings/rtc/RTC.c +++ b/shared-bindings/rtc/RTC.c @@ -93,7 +93,7 @@ MP_PROPERTY_GETSET(rtc_rtc_datetime_obj, //| //| A positive value speeds up the clock and a negative value slows it down. //| -//| **Limitations:** Calibration not supported on SAMD, nRF, RP240, Spresense, and STM. +//| **Limitations:** Calibration not supported on SAMD, Nordic, RP240, Spresense, and STM. //| //| Range and value is hardware specific, but one step is often approximately 1 ppm:: //| diff --git a/tests/circuitpython-manual/alarm/deepsleep.py b/tests/circuitpython-manual/alarm/deepsleep.py index ab4f9ea70a554..66c0066b94f12 100644 --- a/tests/circuitpython-manual/alarm/deepsleep.py +++ b/tests/circuitpython-manual/alarm/deepsleep.py @@ -73,7 +73,7 @@ def show_noalarm(): pin_alarm = alarm.pin.PinAlarm( pin=wake_pin, value=True, edge=True, pull=True ) # STM32 must be this exact config -# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # NRF and ESP32S2 must use level, not edge +# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # Nordic and ESP32S2 must use level, not edge # pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=True, pull=True) # RP2040 supports any config alarm.exit_and_deep_sleep_until_alarms(time_alarm, pin_alarm) diff --git a/tests/circuitpython-manual/alarm/lightsleep.py b/tests/circuitpython-manual/alarm/lightsleep.py index b2878db4bbd81..c826b2fe641da 100644 --- a/tests/circuitpython-manual/alarm/lightsleep.py +++ b/tests/circuitpython-manual/alarm/lightsleep.py @@ -58,7 +58,7 @@ def show_noalarm(): ## PinAlarm only needs to be set once pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=True, pull=True) # STM32, RP2040 -# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # NRF, ESP32-S2, RP2040 +# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # Nordic, ESP32-S2, RP2040 while True: ## TimeAlarms must be reset each time you sleep, since they use monotonic time diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py index d60f4e54c055b..5f6c4c2d7d941 100644 --- a/tools/ci_fetch_deps.py +++ b/tools/ci_fetch_deps.py @@ -68,7 +68,7 @@ def matching_submodules(s): ], "litex": ["extmod/ulab/", "lib/tinyusb/", "lib/tlsf"], "mimxrt10xx": ["extmod/ulab/", "lib/tinyusb/", "lib/tlsf", "data/nvm.toml/"], - "nrf": [ + "nordic": [ "extmod/ulab/", "lib/mp3/", "lib/protomatter/", @@ -176,7 +176,7 @@ def main(target): submodules = ["tools/"] # for huffman elif target == "windows": # This builds one board from a number of ports so fill out a bunch of submodules - for port in ("atmel-samd", "nrf", "raspberrypi", "stm"): + for port in ("atmel-samd", "nordic", "raspberrypi", "stm"): submodules.append(f"ports/{port}") submodules.extend(PORT_DEPS[port]) unique_submodules = set(submodules) diff --git a/tools/merge_micropython.py b/tools/merge_micropython.py index 262225c52f705..f90316bed3886 100644 --- a/tools/merge_micropython.py +++ b/tools/merge_micropython.py @@ -27,6 +27,7 @@ "esp8266", "mimxrt", "minimal", + "nordic", "pic16bit", "powerpc", "qemu-arm", @@ -59,31 +60,6 @@ git.rm(path) line = out_buf.readline() -# MicroPython added their nrf code in ports/nrf too. So, we always take our version. -out_buf = StringIO() -git.status("--porcelain=1", "ports/nrf", _out=out_buf) -out_buf.seek(0) -line = out_buf.readline() -while line: - state, path = line.split() - if state == "UU": - git.checkout("--ours", path) - git.add(path) - elif state == "UA": - git.rm(path) - elif state == "AA": - git.rm("-f", path) - elif state == "A": - git.rm("-f", path) - elif state == "DU": - git.rm(path) - elif state == "DD": - git.rm(path) - else: - print(state, path) - line = out_buf.readline() - - # MicroPython has their own CI settings. Let's not use them now. out_buf = StringIO() git.status("--porcelain=1", ".github/workflows", _out=out_buf)