You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/10/18 21:00:55 UTC
[GitHub] andrzej-kaczmarek closed pull request #1348: hw/bsp: Rename Nordic BSPs

andrzej-kaczmarek closed pull request #1348: hw/bsp: Rename Nordic BSPs
URL: https://github.com/apache/mynewt-core/pull/1348
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/apps/blesplit/README.md b/apps/blesplit/README.md
index adb1be3efd..8be3e25d2a 100644
--- a/apps/blesplit/README.md
+++ b/apps/blesplit/README.md
@@ -47,7 +47,7 @@ You can use splitty as part of a split app by setting up your target.
 targets/app
     app=@apache-mynewt-core/apps/splitty
     loader=@apache-mynewt-core/apps/slinky
-    bsp=@apache-mynewt-core/hw/bsp/nrf52dk
+    bsp=@apache-mynewt-core/hw/bsp/nordic_pca10040
     build_profile=optimized
 ```
 
diff --git a/apps/splitty/README.md b/apps/splitty/README.md
index adb1be3efd..8be3e25d2a 100644
--- a/apps/splitty/README.md
+++ b/apps/splitty/README.md
@@ -47,7 +47,7 @@ You can use splitty as part of a split app by setting up your target.
 targets/app
     app=@apache-mynewt-core/apps/splitty
     loader=@apache-mynewt-core/apps/slinky
-    bsp=@apache-mynewt-core/hw/bsp/nrf52dk
+    bsp=@apache-mynewt-core/hw/bsp/nordic_pca10040
     build_profile=optimized
 ```
 
diff --git a/docs/os/core_os/porting/port_bsp.rst b/docs/os/core_os/porting/port_bsp.rst
index 0d6e5b3f26..7593f126a4 100644
--- a/docs/os/core_os/porting/port_bsp.rst
+++ b/docs/os/core_os/porting/port_bsp.rst
@@ -272,17 +272,17 @@ BSP scripts are quite simple, and you can likely get away with just copying them
     # This script attaches a gdb session to a Mynewt image running on your BSP.
 
     # If your BSP uses JLink, a good example script to copy is:
-    #     repos/apache-mynewt-core/hw/bsp/nrf52dk/nrf52dk_debug.sh
+    #     repos/apache-mynewt-core/hw/bsp/nordic_pca10040/nordic_pca10040_debug.sh
     #
     # If your BSP uses OpenOCD, a good example script to copy is:
     #     repos/apache-mynewt-core/hw/bsp/rb-nano2/rb-nano2_debug.sh
 
-Our example nRF52 BSP uses JLink, so we will copy the nRF52dk BSP's scripts:
+Our example Nordic nRF52 BSP uses JLink, so we will copy the Nordic PCA10040 (nRF52 DK) BSP's scripts:
 
 ::
 
-    cp repos/apache-mynewt-core/hw/bsp/nrf52dk/nrf52dk_debug.sh hw/bsp/myboard/myboard_debug.sh
-    cp repos/apache-mynewt-core/hw/bsp/nrf52dk/nrf52dk_download.sh hw/bsp/myboard/myboard_download.sh
+    cp repos/apache-mynewt-core/hw/bsp/nordic_pca10040/nordic_pca10040_debug.sh hw/bsp/myboard/myboard_debug.sh
+    cp repos/apache-mynewt-core/hw/bsp/nordic_pca10040/nordic_pca10040_download.sh hw/bsp/myboard/myboard_download.sh
 
 Fill in BSP functions and defines
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -354,12 +354,12 @@ This file is named according to the following pattern: ``hw/bsp/myboard/src/arch
 The best approach for creating this file is to copy from other BSPs. If there is another BSP that uses the same MCU, you
 might be able to use most or all of its startup file.
 
-For our example BSP, we'll just copy the nRF52dk BSP's startup code:
+For our example BSP, we'll just copy the Nordic PCA10040 (nRF52 DK) BSP's startup code:
 
 .. code-block:: console
 
     $ mkdir -p hw/bsp/myboard/src/arch/cortex_m4
-    $ cp repos/apache-mynewt-core/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s hw/bsp/myboard/src/arch/cortex_m4/
+    $ cp repos/apache-mynewt-core/hw/bsp/nordic_pca10040/src/arch/cortex_m4/gcc_startup_nrf52.s hw/bsp/myboard/src/arch/cortex_m4/
 
 Satisfy MCU requirements
 ~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/os/modules/split/split.rst b/docs/os/modules/split/split.rst
index 0ffd3c9f94..af0bbf2f43 100644
--- a/docs/os/modules/split/split.rst
+++ b/docs/os/modules/split/split.rst
@@ -92,8 +92,8 @@ Tutorial
 Building a Split Image
 ~~~~~~~~~~~~~~~~~~~~~~
 
-We will be referring to the nRF51dk for examples in this document. Let's
-take a look at this board's flash map (defined in
+We will be referring to the Nordic PCA10028 (nRF51 DK) for examples in
+this document. Let's take a look at this board's flash map (defined in
 ``hw/bsp/nrf51dk/bsp.yml``):
 
 +---------------------+--------------+-------------+
@@ -121,7 +121,7 @@ our BSP and application together.
     newt target create bleprph-nrf51dk
     newt target set bleprph-nrf51dk                     \
         app=@apache-mynewt-core/apps/bleprph            \
-        bsp=@apache-mynewt-core/hw/bsp/nrf51dk          \
+        bsp=@apache-mynewt-core/hw/bsp/nordic_pca10028  \
         build_profile=optimized                         \
         syscfg=BLE_LL_CFG_FEAT_LE_ENCRYPTION=0:BLE_SM_LEGACY=0
 
@@ -135,7 +135,7 @@ We can verify the target using the ``target show`` command:
     [~/tmp/myproj2]$ newt target show bleprph-nrf51dk
     targets/bleprph-nrf51dk
         app=@apache-mynewt-core/apps/bleprph
-        bsp=@apache-mynewt-core/hw/bsp/nrf51dk
+        bsp=@apache-mynewt-core/hw/bsp/nordic_pca10028
         build_profile=optimized
         syscfg=BLE_LL_CFG_FEAT_LE_ENCRYPTION=0:BLE_SM_LEGACY=0
 
@@ -206,7 +206,7 @@ upgrade.
     newt target set split-nrf51dk                       \
         loader=@apache-mynewt-core/apps/bleprph         \
         app=@apache-mynewt-core/apps/splitty            \
-        bsp=@apache-mynewt-core/hw/bsp/nrf51dk          \
+        bsp=@apache-mynewt-core/hw/bsp/nordic_pca10028  \
         build_profile=optimized                         \
         syscfg=BLE_LL_CFG_FEAT_LE_ENCRYPTION=0:BLE_SM_LEGACY=0
 
@@ -217,7 +217,7 @@ Verify that the target looks correct:
     [~/tmp/myproj2]$ newt target show split-nrf51dk
     targets/split-nrf51dk
         app=@apache-mynewt-core/apps/splitty
-        bsp=@apache-mynewt-core/hw/bsp/nrf51dk
+        bsp=@apache-mynewt-core/hw/bsp/nordic_pca10028
         build_profile=optimized
         loader=@apache-mynewt-core/apps/bleprph
         syscfg=BLE_LL_CFG_FEAT_LE_ENCRYPTION=0:BLE_SM_LEGACY=0
@@ -280,8 +280,8 @@ application at any time. For example, if your application needs
 bluetooth functionality, it can use the BLE stack present in the loader
 instead of containing its own copy.
 
-Finally, let's deploy the split image to our nRF51dk board. The
-procedure here is the same as if we were using the Unified setup, i.e.,
+Finally, let's deploy the split image to our Nordic PCA10028 (nRF51 DK) board.
+The procedure here is the same as if we were using the Unified setup, i.e.,
 via either the ``newt load`` or ``newt run`` command.
 
 ::
diff --git a/hw/bsp/nrf51dk-16kbram/boot-nrf51xxaa.ld b/hw/bsp/nordic_pca10028-16k/boot-nrf51xxaa.ld
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/boot-nrf51xxaa.ld
rename to hw/bsp/nordic_pca10028-16k/boot-nrf51xxaa.ld
diff --git a/hw/bsp/nrf51dk/bsp.yml b/hw/bsp/nordic_pca10028-16k/bsp.yml
similarity index 76%
rename from hw/bsp/nrf51dk/bsp.yml
rename to hw/bsp/nordic_pca10028-16k/bsp.yml
index f223d4d9da..7a1b6a6c0b 100644
--- a/hw/bsp/nrf51dk/bsp.yml
+++ b/hw/bsp/nordic_pca10028-16k/bsp.yml
@@ -20,16 +20,16 @@
 bsp.arch: cortex_m0
 bsp.compiler: compiler/arm-none-eabi-m0
 bsp.linkerscript:
-    - "hw/bsp/nrf51dk/nrf51xxac.ld"
+    - "hw/bsp/nordic_pca10028-16k/nrf51xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
 bsp.linkerscript.BOOT_LOADER.OVERWRITE:
-    - "hw/bsp/nrf51dk/boot-nrf51xxac.ld"
+    - "hw/bsp/nordic_pca10028-16k/boot-nrf51xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
-bsp.part2linkerscript: "hw/bsp/nrf51dk/split-nrf51dk.ld"
-bsp.downloadscript: "hw/bsp/nrf51dk/nrf51dk_download.sh"
-bsp.debugscript: "hw/bsp/nrf51dk/nrf51dk_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nrf51dk/nrf51dk_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nrf51dk/nrf51dk_debug.cmd"
+bsp.part2linkerscript: "hw/bsp/nordic_pca10028-16k/split-nordic_pca10028-16k.ld"
+bsp.downloadscript: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh"
+bsp.debugscript: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.sh"
+bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd"
+bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.cmd"
 
 bsp.flash_map:
     areas:
diff --git a/hw/bsp/nrf51dk-16kbram/include/bsp/bsp.h b/hw/bsp/nordic_pca10028-16k/include/bsp/bsp.h
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/include/bsp/bsp.h
rename to hw/bsp/nordic_pca10028-16k/include/bsp/bsp.h
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.cmd b/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.cmd
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.cmd
rename to hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.cmd
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.sh b/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.sh
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.sh
rename to hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_debug.sh
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.cmd b/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.cmd
rename to hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.cmd
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh b/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh
rename to hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_download.sh
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_no_boot.ld b/hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_no_boot.ld
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_no_boot.ld
rename to hw/bsp/nordic_pca10028-16k/nordic_pca10028-16k_no_boot.ld
diff --git a/hw/bsp/nrf51dk-16kbram/nrf51xxaa.ld b/hw/bsp/nordic_pca10028-16k/nrf51xxaa.ld
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/nrf51xxaa.ld
rename to hw/bsp/nordic_pca10028-16k/nrf51xxaa.ld
diff --git a/hw/bsp/nordic_pca10028-16k/pkg.yml b/hw/bsp/nordic_pca10028-16k/pkg.yml
new file mode 100644
index 0000000000..db1c316494
--- /dev/null
+++ b/hw/bsp/nordic_pca10028-16k/pkg.yml
@@ -0,0 +1,48 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: hw/bsp/nordic_pca10028-16k
+pkg.type: bsp
+pkg.description: BSP definition for the Nordic PCA10028 (nRF51 DK) with 16KB RAM
+pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - nrf51
+    - nrf51dk
+    - nordic
+    - pca10028
+
+pkg.cflags:
+    - '-DNRF51'
+
+pkg.deps:
+    - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
+    - "@apache-mynewt-core/libc/baselibc"
+
+pkg.deps.BLE_DEVICE:
+    - "@apache-mynewt-core/hw/drivers/nimble/nrf51"
+
+pkg.deps.UART_0:
+    - "@apache-mynewt-core/hw/drivers/uart/uart_hal"
+
+pkg.deps.UART_1:
+    - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"
+
+pkg.deps.ADC_0:
+    - "@apache-mynewt-core/hw/drivers/adc/adc_nrf51"
diff --git a/hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld b/hw/bsp/nordic_pca10028-16k/split-nordic_pca10028-16k.ld
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld
rename to hw/bsp/nordic_pca10028-16k/split-nordic_pca10028-16k.ld
diff --git a/hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s b/hw/bsp/nordic_pca10028-16k/src/arch/cortex_m0/gcc_startup_nrf51.s
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51.s
rename to hw/bsp/nordic_pca10028-16k/src/arch/cortex_m0/gcc_startup_nrf51.s
diff --git a/hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51_split.s b/hw/bsp/nordic_pca10028-16k/src/arch/cortex_m0/gcc_startup_nrf51_split.s
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/src/arch/cortex_m0/gcc_startup_nrf51_split.s
rename to hw/bsp/nordic_pca10028-16k/src/arch/cortex_m0/gcc_startup_nrf51_split.s
diff --git a/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c b/hw/bsp/nordic_pca10028-16k/src/hal_bsp.c
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
rename to hw/bsp/nordic_pca10028-16k/src/hal_bsp.c
diff --git a/hw/bsp/nrf51dk-16kbram/src/sbrk.c b/hw/bsp/nordic_pca10028-16k/src/sbrk.c
similarity index 100%
rename from hw/bsp/nrf51dk-16kbram/src/sbrk.c
rename to hw/bsp/nordic_pca10028-16k/src/sbrk.c
diff --git a/hw/bsp/nrf51dk-16kbram/syscfg.yml b/hw/bsp/nordic_pca10028-16k/syscfg.yml
similarity index 98%
rename from hw/bsp/nrf51dk-16kbram/syscfg.yml
rename to hw/bsp/nordic_pca10028-16k/syscfg.yml
index 50a8738f4f..8620625f6e 100644
--- a/hw/bsp/nrf51dk-16kbram/syscfg.yml
+++ b/hw/bsp/nordic_pca10028-16k/syscfg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-# Package: hw/bsp/nrf51dk-16kbram
+# Package: hw/bsp/nordic_pca10028-16k
 
 syscfg.defs:
     BSP_NRF51:
diff --git a/hw/bsp/nrf51dk/boot-nrf51xxac.ld b/hw/bsp/nordic_pca10028/boot-nrf51xxac.ld
similarity index 100%
rename from hw/bsp/nrf51dk/boot-nrf51xxac.ld
rename to hw/bsp/nordic_pca10028/boot-nrf51xxac.ld
diff --git a/hw/bsp/nrf51dk-16kbram/bsp.yml b/hw/bsp/nordic_pca10028/bsp.yml
similarity index 79%
rename from hw/bsp/nrf51dk-16kbram/bsp.yml
rename to hw/bsp/nordic_pca10028/bsp.yml
index 84eacd9894..b2914f690b 100644
--- a/hw/bsp/nrf51dk-16kbram/bsp.yml
+++ b/hw/bsp/nordic_pca10028/bsp.yml
@@ -20,16 +20,16 @@
 bsp.arch: cortex_m0
 bsp.compiler: compiler/arm-none-eabi-m0
 bsp.linkerscript:
-    - "hw/bsp/nrf51dk-16kbram/nrf51xxaa.ld"
+    - "hw/bsp/nordic_pca10028/nrf51xxac.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
 bsp.linkerscript.BOOT_LOADER.OVERWRITE:
-    - "hw/bsp/nrf51dk-16kbram/boot-nrf51xxaa.ld"
+    - "hw/bsp/nordic_pca10028/boot-nrf51xxac.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx/nrf51.ld"
-bsp.part2linkerscript: "hw/bsp/nrf51dk-16kbram/split-nrf51dk-16kbram.ld"
-bsp.downloadscript: "hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.sh"
-bsp.debugscript: "hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.cmd"
+bsp.part2linkerscript: "hw/bsp/nordic_pca10028/split-nordic_pca10028.ld"
+bsp.downloadscript: "hw/bsp/nordic_pca10028/nordic_pca10028_download.sh"
+bsp.debugscript: "hw/bsp/nordic_pca10028/nordic_pca10028_debug.sh"
+bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd"
+bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10028/nordic_pca10028_debug.cmd"
 
 bsp.flash_map:
     areas:
diff --git a/hw/bsp/nrf51dk/include/bsp/bsp.h b/hw/bsp/nordic_pca10028/include/bsp/bsp.h
similarity index 100%
rename from hw/bsp/nrf51dk/include/bsp/bsp.h
rename to hw/bsp/nordic_pca10028/include/bsp/bsp.h
diff --git a/hw/bsp/nrf51dk/nrf51dk_debug.cmd b/hw/bsp/nordic_pca10028/nordic_pca10028_debug.cmd
similarity index 100%
rename from hw/bsp/nrf51dk/nrf51dk_debug.cmd
rename to hw/bsp/nordic_pca10028/nordic_pca10028_debug.cmd
diff --git a/hw/bsp/nrf51dk/nrf51dk_debug.sh b/hw/bsp/nordic_pca10028/nordic_pca10028_debug.sh
similarity index 100%
rename from hw/bsp/nrf51dk/nrf51dk_debug.sh
rename to hw/bsp/nordic_pca10028/nordic_pca10028_debug.sh
diff --git a/hw/bsp/nrf51dk/nrf51dk_download.cmd b/hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd
similarity index 100%
rename from hw/bsp/nrf51dk/nrf51dk_download.cmd
rename to hw/bsp/nordic_pca10028/nordic_pca10028_download.cmd
diff --git a/hw/bsp/nrf51dk/nrf51dk_download.sh b/hw/bsp/nordic_pca10028/nordic_pca10028_download.sh
similarity index 100%
rename from hw/bsp/nrf51dk/nrf51dk_download.sh
rename to hw/bsp/nordic_pca10028/nordic_pca10028_download.sh
diff --git a/hw/bsp/nrf51dk/nrf51dk_no_boot.ld b/hw/bsp/nordic_pca10028/nordic_pca10028_no_boot.ld
similarity index 100%
rename from hw/bsp/nrf51dk/nrf51dk_no_boot.ld
rename to hw/bsp/nordic_pca10028/nordic_pca10028_no_boot.ld
diff --git a/hw/bsp/nrf51dk/nrf51xxac.ld b/hw/bsp/nordic_pca10028/nrf51xxac.ld
similarity index 100%
rename from hw/bsp/nrf51dk/nrf51xxac.ld
rename to hw/bsp/nordic_pca10028/nrf51xxac.ld
diff --git a/hw/bsp/nordic_pca10028/pkg.yml b/hw/bsp/nordic_pca10028/pkg.yml
new file mode 100644
index 0000000000..0e26856ecc
--- /dev/null
+++ b/hw/bsp/nordic_pca10028/pkg.yml
@@ -0,0 +1,48 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: hw/bsp/nordic_pca10028
+pkg.type: bsp
+pkg.description: BSP definition for the Nordic PCA10028 (nRF51 DK)
+pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - nrf51
+    - nrf51dk
+    - nordic
+    - pca10028
+
+pkg.cflags:
+    - '-DNRF51'
+
+pkg.deps:
+    - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
+    - "@apache-mynewt-core/libc/baselibc"
+
+pkg.deps.BLE_DEVICE:
+    - "@apache-mynewt-core/hw/drivers/nimble/nrf51"
+
+pkg.deps.UART_0:
+    - "@apache-mynewt-core/hw/drivers/uart/uart_hal"
+
+pkg.deps.UART_1:
+    - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"
+
+pkg.deps.ADC_0:
+    - "@apache-mynewt-core/hw/drivers/adc/adc_nrf51"
diff --git a/hw/bsp/nrf51dk/split-nrf51dk.ld b/hw/bsp/nordic_pca10028/split-nordic_pca10028.ld
similarity index 100%
rename from hw/bsp/nrf51dk/split-nrf51dk.ld
rename to hw/bsp/nordic_pca10028/split-nordic_pca10028.ld
diff --git a/hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s b/hw/bsp/nordic_pca10028/src/arch/cortex_m0/gcc_startup_nrf51.s
similarity index 100%
rename from hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51.s
rename to hw/bsp/nordic_pca10028/src/arch/cortex_m0/gcc_startup_nrf51.s
diff --git a/hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51_split.s b/hw/bsp/nordic_pca10028/src/arch/cortex_m0/gcc_startup_nrf51_split.s
similarity index 100%
rename from hw/bsp/nrf51dk/src/arch/cortex_m0/gcc_startup_nrf51_split.s
rename to hw/bsp/nordic_pca10028/src/arch/cortex_m0/gcc_startup_nrf51_split.s
diff --git a/hw/bsp/nrf51dk/src/hal_bsp.c b/hw/bsp/nordic_pca10028/src/hal_bsp.c
similarity index 100%
rename from hw/bsp/nrf51dk/src/hal_bsp.c
rename to hw/bsp/nordic_pca10028/src/hal_bsp.c
diff --git a/hw/bsp/nrf51dk/src/sbrk.c b/hw/bsp/nordic_pca10028/src/sbrk.c
similarity index 100%
rename from hw/bsp/nrf51dk/src/sbrk.c
rename to hw/bsp/nordic_pca10028/src/sbrk.c
diff --git a/hw/bsp/nrf51dk/syscfg.yml b/hw/bsp/nordic_pca10028/syscfg.yml
similarity index 99%
rename from hw/bsp/nrf51dk/syscfg.yml
rename to hw/bsp/nordic_pca10028/syscfg.yml
index 6ef52fc777..d75c382dd4 100644
--- a/hw/bsp/nrf51dk/syscfg.yml
+++ b/hw/bsp/nordic_pca10028/syscfg.yml
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-# Package: hw/bsp/nrf51dk
+# Package: hw/bsp/nordic_pca10028
 
 syscfg.defs:
     BSP_NRF51:
diff --git a/hw/bsp/nrf52-thingy/boot-nrf52xxaa.ld b/hw/bsp/nordic_pca10040/boot-nrf52xxaa.ld
similarity index 100%
rename from hw/bsp/nrf52-thingy/boot-nrf52xxaa.ld
rename to hw/bsp/nordic_pca10040/boot-nrf52xxaa.ld
diff --git a/hw/bsp/nrf52dk/bsp.yml b/hw/bsp/nordic_pca10040/bsp.yml
similarity index 78%
rename from hw/bsp/nrf52dk/bsp.yml
rename to hw/bsp/nordic_pca10040/bsp.yml
index 240b60388a..7103e43947 100644
--- a/hw/bsp/nrf52dk/bsp.yml
+++ b/hw/bsp/nordic_pca10040/bsp.yml
@@ -20,16 +20,16 @@
 bsp.arch: cortex_m4
 bsp.compiler: compiler/arm-none-eabi-m4
 bsp.linkerscript:
-    - "hw/bsp/nrf52dk/nrf52xxaa.ld"
+    - "hw/bsp/nordic_pca10040/nrf52xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
 bsp.linkerscript.BOOT_LOADER.OVERWRITE:
-    - "hw/bsp/nrf52dk/boot-nrf52xxaa.ld"
+    - "hw/bsp/nordic_pca10040/boot-nrf52xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
-bsp.part2linkerscript: "hw/bsp/nrf52dk/split-nrf52dk.ld"
-bsp.downloadscript: "hw/bsp/nrf52dk/nrf52dk_download.sh"
-bsp.debugscript: "hw/bsp/nrf52dk/nrf52dk_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nrf52dk/nrf52dk_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nrf52dk/nrf52dk_debug.cmd"
+bsp.part2linkerscript: "hw/bsp/nordic_pca10040/split-nordic_pca10040.ld"
+bsp.downloadscript: "hw/bsp/nordic_pca10040/nordic_pca10040_download.sh"
+bsp.debugscript: "hw/bsp/nordic_pca10040/nordic_pca10040_debug.sh"
+bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd"
+bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd"
 
 bsp.flash_map:
     areas:
diff --git a/hw/bsp/nrf52dk/include/bsp/bsp.h b/hw/bsp/nordic_pca10040/include/bsp/bsp.h
similarity index 100%
rename from hw/bsp/nrf52dk/include/bsp/bsp.h
rename to hw/bsp/nordic_pca10040/include/bsp/bsp.h
diff --git a/hw/bsp/nrf52-thingy/nrf52-thingy_debug.cmd b/hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd
similarity index 100%
rename from hw/bsp/nrf52-thingy/nrf52-thingy_debug.cmd
rename to hw/bsp/nordic_pca10040/nordic_pca10040_debug.cmd
diff --git a/hw/bsp/nrf52-thingy/nrf52-thingy_debug.sh b/hw/bsp/nordic_pca10040/nordic_pca10040_debug.sh
similarity index 100%
rename from hw/bsp/nrf52-thingy/nrf52-thingy_debug.sh
rename to hw/bsp/nordic_pca10040/nordic_pca10040_debug.sh
diff --git a/hw/bsp/nrf52-thingy/nrf52-thingy_download.cmd b/hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd
similarity index 100%
rename from hw/bsp/nrf52-thingy/nrf52-thingy_download.cmd
rename to hw/bsp/nordic_pca10040/nordic_pca10040_download.cmd
diff --git a/hw/bsp/nrf52-thingy/nrf52-thingy_download.sh b/hw/bsp/nordic_pca10040/nordic_pca10040_download.sh
similarity index 100%
rename from hw/bsp/nrf52-thingy/nrf52-thingy_download.sh
rename to hw/bsp/nordic_pca10040/nordic_pca10040_download.sh
diff --git a/hw/bsp/nrf52-thingy/nrf52-thingy_no_boot.ld b/hw/bsp/nordic_pca10040/nordic_pca10040_no_boot.ld
similarity index 100%
rename from hw/bsp/nrf52-thingy/nrf52-thingy_no_boot.ld
rename to hw/bsp/nordic_pca10040/nordic_pca10040_no_boot.ld
diff --git a/hw/bsp/nrf52-thingy/nrf52xxaa.ld b/hw/bsp/nordic_pca10040/nrf52xxaa.ld
similarity index 100%
rename from hw/bsp/nrf52-thingy/nrf52xxaa.ld
rename to hw/bsp/nordic_pca10040/nrf52xxaa.ld
diff --git a/hw/bsp/nordic_pca10040/pkg.yml b/hw/bsp/nordic_pca10040/pkg.yml
new file mode 100644
index 0000000000..3354359d88
--- /dev/null
+++ b/hw/bsp/nordic_pca10040/pkg.yml
@@ -0,0 +1,49 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: hw/bsp/nordic_pca10040
+pkg.type: bsp
+pkg.description: BSP definition for the Nordic PCA10040 (nRF52 DK)
+pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - nrf52
+    - nrf52dk
+    - nordic
+    - pca10040
+
+pkg.cflags:
+     - '-DNRF52'
+
+pkg.cflags.HARDFLOAT:
+    - -mfloat-abi=hard -mfpu=fpv4-sp-d16
+
+pkg.deps:
+    - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
+    - "@apache-mynewt-core/libc/baselibc"
+
+pkg.deps.ENC_FLASH_DEV:
+    - "@apache-mynewt-core/hw/drivers/flash/enc_flash/ef_nrf5x"
+
+pkg.deps.SOFT_PWM:
+    - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
+
+pkg.deps.UARTBB_0:
+    - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"
+
diff --git a/hw/bsp/nrf52-thingy/split-nrf52-thingy.ld b/hw/bsp/nordic_pca10040/split-nordic_pca10040.ld
similarity index 100%
rename from hw/bsp/nrf52-thingy/split-nrf52-thingy.ld
rename to hw/bsp/nordic_pca10040/split-nordic_pca10040.ld
diff --git a/hw/bsp/nrf52-thingy/src/arch/cortex_m4/gcc_startup_nrf52.s b/hw/bsp/nordic_pca10040/src/arch/cortex_m4/gcc_startup_nrf52.s
similarity index 100%
rename from hw/bsp/nrf52-thingy/src/arch/cortex_m4/gcc_startup_nrf52.s
rename to hw/bsp/nordic_pca10040/src/arch/cortex_m4/gcc_startup_nrf52.s
diff --git a/hw/bsp/nrf52-thingy/src/arch/cortex_m4/gcc_startup_nrf52_split.s b/hw/bsp/nordic_pca10040/src/arch/cortex_m4/gcc_startup_nrf52_split.s
similarity index 100%
rename from hw/bsp/nrf52-thingy/src/arch/cortex_m4/gcc_startup_nrf52_split.s
rename to hw/bsp/nordic_pca10040/src/arch/cortex_m4/gcc_startup_nrf52_split.s
diff --git a/hw/bsp/nrf52dk/src/hal_bsp.c b/hw/bsp/nordic_pca10040/src/hal_bsp.c
similarity index 100%
rename from hw/bsp/nrf52dk/src/hal_bsp.c
rename to hw/bsp/nordic_pca10040/src/hal_bsp.c
diff --git a/hw/bsp/nrf52-thingy/src/sbrk.c b/hw/bsp/nordic_pca10040/src/sbrk.c
similarity index 100%
rename from hw/bsp/nrf52-thingy/src/sbrk.c
rename to hw/bsp/nordic_pca10040/src/sbrk.c
diff --git a/hw/bsp/nrf52dk/syscfg.yml b/hw/bsp/nordic_pca10040/syscfg.yml
similarity index 98%
rename from hw/bsp/nrf52dk/syscfg.yml
rename to hw/bsp/nordic_pca10040/syscfg.yml
index 232ebd5d04..abdd68672a 100644
--- a/hw/bsp/nrf52dk/syscfg.yml
+++ b/hw/bsp/nordic_pca10040/syscfg.yml
@@ -16,7 +16,7 @@
 # under the License.
 #
 
-# Package: hw/bsp/nrf52dk
+# Package: hw/bsp/nordic_pca10040
 
 syscfg.defs:
     BSP_NRF52:
diff --git a/hw/bsp/nrf52840pdk/boot-nrf52840aa.ld b/hw/bsp/nordic_pca10056/boot-nrf52840aa.ld
similarity index 100%
rename from hw/bsp/nrf52840pdk/boot-nrf52840aa.ld
rename to hw/bsp/nordic_pca10056/boot-nrf52840aa.ld
diff --git a/hw/bsp/nrf52840pdk/bsp.yml b/hw/bsp/nordic_pca10056/bsp.yml
similarity index 78%
rename from hw/bsp/nrf52840pdk/bsp.yml
rename to hw/bsp/nordic_pca10056/bsp.yml
index 43c572175d..dbeb98076c 100644
--- a/hw/bsp/nrf52840pdk/bsp.yml
+++ b/hw/bsp/nordic_pca10056/bsp.yml
@@ -20,16 +20,16 @@
 bsp.arch: cortex_m4
 bsp.compiler: compiler/arm-none-eabi-m4
 bsp.linkerscript:
-    - "hw/bsp/nrf52840pdk/nrf52840aa.ld"
+    - "hw/bsp/nordic_pca10056/nrf52840aa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
 bsp.linkerscript.BOOT_LOADER.OVERWRITE:
-    - "hw/bsp/nrf52840pdk/boot-nrf52840aa.ld"
+    - "hw/bsp/nordic_pca10056/boot-nrf52840aa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
-bsp.part2linkerscript: "hw/bsp/nrf52840pdk/split-nrf52840pdk.ld"
-bsp.downloadscript: "hw/bsp/nrf52840pdk/nrf52840pdk_download.sh"
-bsp.debugscript: "hw/bsp/nrf52840pdk/nrf52840pdk_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nrf52840pdk/nrf52840pdk_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nrf52840pdk/nrf52840pdk_debug.cmd"
+bsp.part2linkerscript: "hw/bsp/nordic_pca10056/split-nordic_pca10056.ld"
+bsp.downloadscript: "hw/bsp/nordic_pca10056/nordic_pca10056_download.sh"
+bsp.debugscript: "hw/bsp/nordic_pca10056/nordic_pca10056_debug.sh"
+bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10056/nordic_pca10056_download.cmd"
+bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10056/nordic_pca10056_debug.cmd"
 
 bsp.flash_map:
     areas:
diff --git a/hw/bsp/nrf52840pdk/include/bsp/bsp.h b/hw/bsp/nordic_pca10056/include/bsp/bsp.h
similarity index 100%
rename from hw/bsp/nrf52840pdk/include/bsp/bsp.h
rename to hw/bsp/nordic_pca10056/include/bsp/bsp.h
diff --git a/hw/bsp/nrf52840pdk/nrf52840pdk_debug.cmd b/hw/bsp/nordic_pca10056/nordic_pca10056_debug.cmd
similarity index 100%
rename from hw/bsp/nrf52840pdk/nrf52840pdk_debug.cmd
rename to hw/bsp/nordic_pca10056/nordic_pca10056_debug.cmd
diff --git a/hw/bsp/nrf52840pdk/nrf52840pdk_debug.sh b/hw/bsp/nordic_pca10056/nordic_pca10056_debug.sh
similarity index 100%
rename from hw/bsp/nrf52840pdk/nrf52840pdk_debug.sh
rename to hw/bsp/nordic_pca10056/nordic_pca10056_debug.sh
diff --git a/hw/bsp/nrf52840pdk/nrf52840pdk_download.cmd b/hw/bsp/nordic_pca10056/nordic_pca10056_download.cmd
similarity index 100%
rename from hw/bsp/nrf52840pdk/nrf52840pdk_download.cmd
rename to hw/bsp/nordic_pca10056/nordic_pca10056_download.cmd
diff --git a/hw/bsp/nrf52840pdk/nrf52840pdk_download.sh b/hw/bsp/nordic_pca10056/nordic_pca10056_download.sh
similarity index 100%
rename from hw/bsp/nrf52840pdk/nrf52840pdk_download.sh
rename to hw/bsp/nordic_pca10056/nordic_pca10056_download.sh
diff --git a/hw/bsp/nrf52840pdk/nrf52840pdk_no_boot.ld b/hw/bsp/nordic_pca10056/nordic_pca10056_no_boot.ld
similarity index 100%
rename from hw/bsp/nrf52840pdk/nrf52840pdk_no_boot.ld
rename to hw/bsp/nordic_pca10056/nordic_pca10056_no_boot.ld
diff --git a/hw/bsp/nrf52840pdk/nrf52840aa.ld b/hw/bsp/nordic_pca10056/nrf52840aa.ld
similarity index 100%
rename from hw/bsp/nrf52840pdk/nrf52840aa.ld
rename to hw/bsp/nordic_pca10056/nrf52840aa.ld
diff --git a/hw/bsp/nordic_pca10056/pkg.yml b/hw/bsp/nordic_pca10056/pkg.yml
new file mode 100644
index 0000000000..749e185fc8
--- /dev/null
+++ b/hw/bsp/nordic_pca10056/pkg.yml
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: hw/bsp/nordic_pca10056
+pkg.type: bsp
+pkg.description: BSP definition for the Nordic PCA10056 (nRF52840 DK)
+pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - nrf52840
+    - nrf52840dk
+    - nordic
+    - pca10056
+
+pkg.cflags:
+    - '-DNRF52840_XXAA'
+
+pkg.cflags.HARDFLOAT:
+    - -mfloat-abi=hard -mfpu=fpv4-sp-d16
+
+pkg.deps:
+    - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
+    - "@apache-mynewt-core/libc/baselibc"
+    - "@apache-mynewt-core/sys/flash_map"
+
+pkg.deps.SOFT_PWM:
+    - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
diff --git a/hw/bsp/nrf52840pdk/split-nrf52840pdk.ld b/hw/bsp/nordic_pca10056/split-nordic_pca10056.ld
similarity index 100%
rename from hw/bsp/nrf52840pdk/split-nrf52840pdk.ld
rename to hw/bsp/nordic_pca10056/split-nordic_pca10056.ld
diff --git a/hw/bsp/nrf52840pdk/src/arch/cortex_m4/gcc_startup_nrf52840.s b/hw/bsp/nordic_pca10056/src/arch/cortex_m4/gcc_startup_nrf52840.s
similarity index 100%
rename from hw/bsp/nrf52840pdk/src/arch/cortex_m4/gcc_startup_nrf52840.s
rename to hw/bsp/nordic_pca10056/src/arch/cortex_m4/gcc_startup_nrf52840.s
diff --git a/hw/bsp/nrf52840pdk/src/arch/cortex_m4/gcc_startup_nrf52_split.s b/hw/bsp/nordic_pca10056/src/arch/cortex_m4/gcc_startup_nrf52_split.s
similarity index 100%
rename from hw/bsp/nrf52840pdk/src/arch/cortex_m4/gcc_startup_nrf52_split.s
rename to hw/bsp/nordic_pca10056/src/arch/cortex_m4/gcc_startup_nrf52_split.s
diff --git a/hw/bsp/nrf52840pdk/src/hal_bsp.c b/hw/bsp/nordic_pca10056/src/hal_bsp.c
similarity index 100%
rename from hw/bsp/nrf52840pdk/src/hal_bsp.c
rename to hw/bsp/nordic_pca10056/src/hal_bsp.c
diff --git a/hw/bsp/nrf52840pdk/src/sbrk.c b/hw/bsp/nordic_pca10056/src/sbrk.c
similarity index 100%
rename from hw/bsp/nrf52840pdk/src/sbrk.c
rename to hw/bsp/nordic_pca10056/src/sbrk.c
diff --git a/hw/bsp/nrf52840pdk/syscfg.yml b/hw/bsp/nordic_pca10056/syscfg.yml
similarity index 98%
rename from hw/bsp/nrf52840pdk/syscfg.yml
rename to hw/bsp/nordic_pca10056/syscfg.yml
index 819a077e30..774c243b93 100644
--- a/hw/bsp/nrf52840pdk/syscfg.yml
+++ b/hw/bsp/nordic_pca10056/syscfg.yml
@@ -16,7 +16,7 @@
 # under the License.
 #
 
-# Package: hw/bsp/nrf52840pdk
+# Package: hw/bsp/nordic_pca10056
 
 syscfg.defs:
     BSP_NRF52840:
diff --git a/hw/bsp/nrf52dk/boot-nrf52xxaa.ld b/hw/bsp/nordic_pca20020/boot-nrf52xxaa.ld
similarity index 100%
rename from hw/bsp/nrf52dk/boot-nrf52xxaa.ld
rename to hw/bsp/nordic_pca20020/boot-nrf52xxaa.ld
diff --git a/hw/bsp/nrf52-thingy/bsp.yml b/hw/bsp/nordic_pca20020/bsp.yml
similarity index 80%
rename from hw/bsp/nrf52-thingy/bsp.yml
rename to hw/bsp/nordic_pca20020/bsp.yml
index c5a8ded8b2..524048b8d7 100644
--- a/hw/bsp/nrf52-thingy/bsp.yml
+++ b/hw/bsp/nordic_pca20020/bsp.yml
@@ -20,17 +20,17 @@
 bsp.arch: cortex_m4
 bsp.compiler: compiler/arm-none-eabi-m4
 bsp.linkerscript:
-    - "hw/bsp/nrf52-thingy/nrf52xxaa.ld"
+    - "hw/bsp/nordic_pca20020/nrf52xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
 bsp.linkerscript.BOOT_LOADER.OVERWRITE:
-    - "hw/bsp/nrf52-thingy/boot-nrf52xxaa.ld"
+    - "hw/bsp/nordic_pca20020/boot-nrf52xxaa.ld"
     - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx/nrf52.ld"
-bsp.part2linkerscript: "hw/bsp/nrf52-thingy/split-nrf52-thingy.ld"
-bsp.downloadscript: "hw/bsp/nrf52-thingy/nrf52-thingy_download.sh"
-bsp.debugscript: "hw/bsp/nrf52-thingy/nrf52-thingy_debug.sh"
+bsp.part2linkerscript: "hw/bsp/nordic_pca20020/split-nordic_pca20020.ld"
+bsp.downloadscript: "hw/bsp/nordic_pca20020/nordic_pca20020_download.sh"
+bsp.debugscript: "hw/bsp/nordic_pca20020/nordic_pca20020_debug.sh"
 bsp.downloadscript.WINDOWS.OVERWRITE:
-    "hw/bsp/nrf52-thingy/nrf52-thingy_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nrf52-thingy/nrf52-thingy_debug.cmd"
+    "hw/bsp/nordic_pca20020/nordic_pca20020_download.cmd"
+bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca20020/nordic_pca20020_debug.cmd"
 
 bsp.flash_map:
     areas:
diff --git a/hw/bsp/nrf52-thingy/include/bsp/bsp.h b/hw/bsp/nordic_pca20020/include/bsp/bsp.h
similarity index 100%
rename from hw/bsp/nrf52-thingy/include/bsp/bsp.h
rename to hw/bsp/nordic_pca20020/include/bsp/bsp.h
diff --git a/hw/bsp/nrf52dk/nrf52dk_debug.cmd b/hw/bsp/nordic_pca20020/nordic_pca20020_debug.cmd
similarity index 100%
rename from hw/bsp/nrf52dk/nrf52dk_debug.cmd
rename to hw/bsp/nordic_pca20020/nordic_pca20020_debug.cmd
diff --git a/hw/bsp/nrf52dk/nrf52dk_debug.sh b/hw/bsp/nordic_pca20020/nordic_pca20020_debug.sh
similarity index 100%
rename from hw/bsp/nrf52dk/nrf52dk_debug.sh
rename to hw/bsp/nordic_pca20020/nordic_pca20020_debug.sh
diff --git a/hw/bsp/nrf52dk/nrf52dk_download.cmd b/hw/bsp/nordic_pca20020/nordic_pca20020_download.cmd
similarity index 100%
rename from hw/bsp/nrf52dk/nrf52dk_download.cmd
rename to hw/bsp/nordic_pca20020/nordic_pca20020_download.cmd
diff --git a/hw/bsp/nrf52dk/nrf52dk_download.sh b/hw/bsp/nordic_pca20020/nordic_pca20020_download.sh
similarity index 100%
rename from hw/bsp/nrf52dk/nrf52dk_download.sh
rename to hw/bsp/nordic_pca20020/nordic_pca20020_download.sh
diff --git a/hw/bsp/nrf52dk/nrf52dk_no_boot.ld b/hw/bsp/nordic_pca20020/nordic_pca20020_no_boot.ld
similarity index 100%
rename from hw/bsp/nrf52dk/nrf52dk_no_boot.ld
rename to hw/bsp/nordic_pca20020/nordic_pca20020_no_boot.ld
diff --git a/hw/bsp/nrf52dk/nrf52xxaa.ld b/hw/bsp/nordic_pca20020/nrf52xxaa.ld
similarity index 100%
rename from hw/bsp/nrf52dk/nrf52xxaa.ld
rename to hw/bsp/nordic_pca20020/nrf52xxaa.ld
diff --git a/hw/bsp/nordic_pca20020/pkg.yml b/hw/bsp/nordic_pca20020/pkg.yml
new file mode 100644
index 0000000000..35dd9a16ca
--- /dev/null
+++ b/hw/bsp/nordic_pca20020/pkg.yml
@@ -0,0 +1,47 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: hw/bsp/nordic_pca20020
+pkg.type: bsp
+pkg.description: BSP definition for the Nordic PCA20020 (Thingy:52)
+pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - nrf52
+    - thingy
+    - nrf52-thingy
+
+pkg.cflags:
+    - '-DNRF52'
+
+pkg.cflags.HARDFLOAT:
+    - -mfloat-abi=hard -mfpu=fpv4-sp-d16
+
+pkg.deps:
+    - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
+    - "@apache-mynewt-core/libc/baselibc"
+
+pkg.deps.SOFT_PWM:
+    - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
+
+pkg.deps.LIS2DH12_ONB:
+    - "@apache-mynewt-core/hw/drivers/sensors/lis2dh12"
+
+pkg.init:
+    config_lis2dh12_sensor: 400
diff --git a/hw/bsp/nrf52dk/split-nrf52dk.ld b/hw/bsp/nordic_pca20020/split-nordic_pca20020.ld
similarity index 100%
rename from hw/bsp/nrf52dk/split-nrf52dk.ld
rename to hw/bsp/nordic_pca20020/split-nordic_pca20020.ld
diff --git a/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s b/hw/bsp/nordic_pca20020/src/arch/cortex_m4/gcc_startup_nrf52.s
similarity index 100%
rename from hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52.s
rename to hw/bsp/nordic_pca20020/src/arch/cortex_m4/gcc_startup_nrf52.s
diff --git a/hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52_split.s b/hw/bsp/nordic_pca20020/src/arch/cortex_m4/gcc_startup_nrf52_split.s
similarity index 100%
rename from hw/bsp/nrf52dk/src/arch/cortex_m4/gcc_startup_nrf52_split.s
rename to hw/bsp/nordic_pca20020/src/arch/cortex_m4/gcc_startup_nrf52_split.s
diff --git a/hw/bsp/nrf52-thingy/src/hal_bsp.c b/hw/bsp/nordic_pca20020/src/hal_bsp.c
similarity index 100%
rename from hw/bsp/nrf52-thingy/src/hal_bsp.c
rename to hw/bsp/nordic_pca20020/src/hal_bsp.c
diff --git a/hw/bsp/nrf52dk/src/sbrk.c b/hw/bsp/nordic_pca20020/src/sbrk.c
similarity index 100%
rename from hw/bsp/nrf52dk/src/sbrk.c
rename to hw/bsp/nordic_pca20020/src/sbrk.c
diff --git a/hw/bsp/nrf52-thingy/syscfg.yml b/hw/bsp/nordic_pca20020/syscfg.yml
similarity index 100%
rename from hw/bsp/nrf52-thingy/syscfg.yml
rename to hw/bsp/nordic_pca20020/syscfg.yml
diff --git a/hw/bsp/nrf51dk-16kbram/pkg.yml b/hw/bsp/nrf51dk-16kbram/pkg.yml
index c05ac24afe..6324548387 100644
--- a/hw/bsp/nrf51dk-16kbram/pkg.yml
+++ b/hw/bsp/nrf51dk-16kbram/pkg.yml
@@ -18,29 +18,6 @@
 #
 
 pkg.name: hw/bsp/nrf51dk-16kbram
-pkg.type: bsp
-pkg.description: BSP definition for a Nordic nRF51 DK SoC with 16kB RAM.
-pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
-    - nrf51
-    - nrf51dk
+pkg.type: transient
+pkg.link: "@apache-mynewt-core/hw/bsp/nordic_pca10028-16k"
 
-pkg.cflags:
-    - '-DNRF51'
-
-pkg.deps:
-    - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
-    - "@apache-mynewt-core/libc/baselibc"
-
-pkg.deps.BLE_DEVICE:
-    - "@apache-mynewt-core/hw/drivers/nimble/nrf51"
-
-pkg.deps.UART_0:
-    - "@apache-mynewt-core/hw/drivers/uart/uart_hal"
-
-pkg.deps.UART_1:
-    - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"
-
-pkg.deps.ADC_0:
-    - "@apache-mynewt-core/hw/drivers/adc/adc_nrf51"
diff --git a/hw/bsp/nrf51dk/pkg.yml b/hw/bsp/nrf51dk/pkg.yml
index ddb199c96c..8b58932010 100644
--- a/hw/bsp/nrf51dk/pkg.yml
+++ b/hw/bsp/nrf51dk/pkg.yml
@@ -18,29 +18,6 @@
 #
 
 pkg.name: hw/bsp/nrf51dk
-pkg.type: bsp
-pkg.description: BSP definition for the Nordic nRF51 DK SoC.
-pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
-    - nrf51
-    - nrf51dk
+pkg.type: transient
+pkg.link: "@apache-mynewt-core/hw/bsp/nordic_pca10028"
 
-pkg.cflags:
-    - '-DNRF51'
-
-pkg.deps:
-    - "@apache-mynewt-core/hw/mcu/nordic/nrf51xxx"
-    - "@apache-mynewt-core/libc/baselibc"
-
-pkg.deps.BLE_DEVICE:
-    - "@apache-mynewt-core/hw/drivers/nimble/nrf51"
-
-pkg.deps.UART_0:
-    - "@apache-mynewt-core/hw/drivers/uart/uart_hal"
-
-pkg.deps.UART_1:
-    - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"
-
-pkg.deps.ADC_0:
-    - "@apache-mynewt-core/hw/drivers/adc/adc_nrf51"
diff --git a/hw/bsp/nrf52-thingy/pkg.yml b/hw/bsp/nrf52-thingy/pkg.yml
index 01dbb9aa1a..16cdfdac99 100644
--- a/hw/bsp/nrf52-thingy/pkg.yml
+++ b/hw/bsp/nrf52-thingy/pkg.yml
@@ -18,30 +18,5 @@
 #
 
 pkg.name: hw/bsp/nrf52-thingy
-pkg.type: bsp
-pkg.description: BSP definition for the Nordic Thingy:52
-pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
-    - nrf52
-    - thingy
-    - nrf52-thingy
-
-pkg.cflags:
-    - '-DNRF52'
-
-pkg.cflags.HARDFLOAT:
-    - -mfloat-abi=hard -mfpu=fpv4-sp-d16
-
-pkg.deps:
-    - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
-    - "@apache-mynewt-core/libc/baselibc"
-
-pkg.deps.SOFT_PWM:
-    - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
-
-pkg.deps.LIS2DH12_ONB:
-    - "@apache-mynewt-core/hw/drivers/sensors/lis2dh12"
-
-pkg.init:
-    config_lis2dh12_sensor: 400
+pkg.type: transient
+pkg.link: "@apache-mynewt-core/hw/bsp/nordic_pca20020"
diff --git a/hw/bsp/nrf52840pdk/pkg.yml b/hw/bsp/nrf52840pdk/pkg.yml
index a38b38af2e..8d05e43bfa 100644
--- a/hw/bsp/nrf52840pdk/pkg.yml
+++ b/hw/bsp/nrf52840pdk/pkg.yml
@@ -18,24 +18,6 @@
 #
 
 pkg.name: hw/bsp/nrf52840pdk
-pkg.type: bsp
-pkg.description: BSP definition for the Nordic nRF52840 PDK (PCA 10056).
-pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
-    - nrf52840
-    - nrf52840pdk
+pkg.type: transient
+pkg.link: "@apache-mynewt-core/hw/bsp/nordic_pca10056"
 
-pkg.cflags:
-    - '-DNRF52840_XXAA'
-
-pkg.cflags.HARDFLOAT:
-    - -mfloat-abi=hard -mfpu=fpv4-sp-d16
-
-pkg.deps:
-    - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
-    - "@apache-mynewt-core/libc/baselibc"
-    - "@apache-mynewt-core/sys/flash_map"
-
-pkg.deps.SOFT_PWM:
-    - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
diff --git a/hw/bsp/nrf52dk/pkg.yml b/hw/bsp/nrf52dk/pkg.yml
index cc5951a939..bd044fc769 100644
--- a/hw/bsp/nrf52dk/pkg.yml
+++ b/hw/bsp/nrf52dk/pkg.yml
@@ -18,29 +18,6 @@
 #
 
 pkg.name: hw/bsp/nrf52dk
-pkg.type: bsp
-pkg.description: BSP definition for the Nordic nRF52 Development Kit (PCA 10040).
-pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
-    - nrf52
-    - nrf52dk
+pkg.type: transient
+pkg.link: "@apache-mynewt-core/hw/bsp/nordic_pca10040"
 
-pkg.cflags:
-     - '-DNRF52'
-
-pkg.cflags.HARDFLOAT:
-    - -mfloat-abi=hard -mfpu=fpv4-sp-d16
-
-pkg.deps:
-    - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
-    - "@apache-mynewt-core/libc/baselibc"
-
-pkg.deps.ENC_FLASH_DEV:
-    - "@apache-mynewt-core/hw/drivers/flash/enc_flash/ef_nrf5x"
-
-pkg.deps.SOFT_PWM:
-    - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
-
-pkg.deps.UARTBB_0:
-    - "@apache-mynewt-core/hw/drivers/uart/uart_bitbang"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services