[mynewt-core] 01/03: mcu/da1469x: Move scripts from bsp to mcu

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit afcf581beec4fe1667299ff57ad9980c334e3d28
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Feb 17 10:05:44 2022 +0100

    mcu/da1469x: Move scripts from bsp to mcu
    
    To avoid having multiple copies of download/debug scripts in da1469x based bsps,
    scripts are moved to scripts folder that can be used by many bsps.
    This is first step to introduce second Dialog board.
---
 hw/bsp/dialog_da1469x-dk-pro/bsp.yml                                  | 4 ++--
 .../dialog/da1469x/scripts}/cfg/device.cfg                            | 0
 .../dialog/da1469x/scripts}/cfg/ft4232h.cfg                           | 0
 .../dialog/da1469x/scripts}/da1469x_header_tool.py                    | 0
 .../dialog/da1469x/scripts}/da1469x_serial.py                         | 0
 .../dialog/da1469x/scripts/dialog_da1469x-debug_jlink.sh}             | 0
 .../dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh}          | 4 ++--
 .../dialog_da1469x-dk-pro => mcu/dialog/da1469x/scripts}/otp_tool.py  | 0
 hw/{bsp/dialog_da1469x-dk-pro => mcu/dialog/da1469x/scripts}/reset.sh | 0
 .../dialog_da1469x-dk-pro => mcu/dialog/da1469x/scripts}/reset_ocd.sh | 0
 10 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/bsp/dialog_da1469x-dk-pro/bsp.yml b/hw/bsp/dialog_da1469x-dk-pro/bsp.yml
index 9120492..7b184e5 100644
--- a/hw/bsp/dialog_da1469x-dk-pro/bsp.yml
+++ b/hw/bsp/dialog_da1469x-dk-pro/bsp.yml
@@ -20,8 +20,8 @@
 bsp.arch: cortex_m33
 bsp.compiler: "@apache-mynewt-core/compiler/arm-none-eabi-m33"
 bsp.downloadscript:
-    "hw/bsp/dialog_da1469x-dk-pro/dialog_da1469x-dk-pro_download.sh"
-bsp.debugscript: "hw/bsp/dialog_da1469x-dk-pro/dialog_da1469x-dk-pro_debug.sh"
+    "hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh"
+bsp.debugscript: "hw/mcu/dialog/da1469x/scripts/dialog_da1469x-debug_jlink.sh"
 
 bsp.linkerscript:
     - "hw/bsp/dialog_da1469x-dk-pro/da1469x.ld"
diff --git a/hw/bsp/dialog_da1469x-dk-pro/cfg/device.cfg b/hw/mcu/dialog/da1469x/scripts/cfg/device.cfg
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/cfg/device.cfg
rename to hw/mcu/dialog/da1469x/scripts/cfg/device.cfg
diff --git a/hw/bsp/dialog_da1469x-dk-pro/cfg/ft4232h.cfg b/hw/mcu/dialog/da1469x/scripts/cfg/ft4232h.cfg
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/cfg/ft4232h.cfg
rename to hw/mcu/dialog/da1469x/scripts/cfg/ft4232h.cfg
diff --git a/hw/bsp/dialog_da1469x-dk-pro/da1469x_header_tool.py b/hw/mcu/dialog/da1469x/scripts/da1469x_header_tool.py
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/da1469x_header_tool.py
rename to hw/mcu/dialog/da1469x/scripts/da1469x_header_tool.py
diff --git a/hw/bsp/dialog_da1469x-dk-pro/da1469x_serial.py b/hw/mcu/dialog/da1469x/scripts/da1469x_serial.py
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/da1469x_serial.py
rename to hw/mcu/dialog/da1469x/scripts/da1469x_serial.py
diff --git a/hw/bsp/dialog_da1469x-dk-pro/dialog_da1469x-dk-pro_debug.sh b/hw/mcu/dialog/da1469x/scripts/dialog_da1469x-debug_jlink.sh
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/dialog_da1469x-dk-pro_debug.sh
rename to hw/mcu/dialog/da1469x/scripts/dialog_da1469x-debug_jlink.sh
diff --git a/hw/bsp/dialog_da1469x-dk-pro/dialog_da1469x-dk-pro_download.sh b/hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh
similarity index 95%
rename from hw/bsp/dialog_da1469x-dk-pro/dialog_da1469x-dk-pro_download.sh
rename to hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh
index 9755363..572465e 100755
--- a/hw/bsp/dialog_da1469x-dk-pro/dialog_da1469x-dk-pro_download.sh
+++ b/hw/mcu/dialog/da1469x/scripts/dialog_da1469x-download_jlink.sh
@@ -88,11 +88,11 @@ if [ "$BOOT_LOADER" ]; then
             exit 1
         fi
 
-        ${BSP_PATH}/da1469x_header_tool.py secure --sign ${MYNEWT_VAL_BOOT_SIG_PEM} \
+        ${CORE_PATH}/hw/mcu/dialog/da1469x/scripts/da1469x_header_tool.py secure --sign ${MYNEWT_VAL_BOOT_SIG_PEM} \
             -s${MYNEWT_VAL_BOOT_SIG_SLOT} -d${MYNEWT_VAL_BOOT_AES_SLOT} \
             -E${MYNEWT_VAL_BOOT_AES_KEY} ${IMAGE_FILE} ${FILE_NAME}
     else
-        ${BSP_PATH}/da1469x_header_tool.py nonsecure ${IMAGE_FILE} ${FILE_NAME}
+        ${CORE_PATH}/hw/mcu/dialog/da1469x/scripts/da1469x_header_tool.py nonsecure ${IMAGE_FILE} ${FILE_NAME}
     fi
 
     if [ $? != 0 ]; then
diff --git a/hw/bsp/dialog_da1469x-dk-pro/otp_tool.py b/hw/mcu/dialog/da1469x/scripts/otp_tool.py
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/otp_tool.py
rename to hw/mcu/dialog/da1469x/scripts/otp_tool.py
diff --git a/hw/bsp/dialog_da1469x-dk-pro/reset.sh b/hw/mcu/dialog/da1469x/scripts/reset.sh
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/reset.sh
rename to hw/mcu/dialog/da1469x/scripts/reset.sh
diff --git a/hw/bsp/dialog_da1469x-dk-pro/reset_ocd.sh b/hw/mcu/dialog/da1469x/scripts/reset_ocd.sh
similarity index 100%
rename from hw/bsp/dialog_da1469x-dk-pro/reset_ocd.sh
rename to hw/mcu/dialog/da1469x/scripts/reset_ocd.sh