License fixes, few other tweaks

Author: multiplemonomials

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/PeripheralPins.c

@@ -34,6 +34,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 #include "PeripheralPins.h"

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h

@@ -33,7 +33,8 @@
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
 /* MBED TARGET LIST: NRF52840_DK */

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/cmsis_nvic.h

@@ -3,6 +3,7 @@
  *******************************************************************************
  * Copyright (c) 2016 ARM Limited. All rights reserved.
  * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

targets/upload_method_cfg/NRF52840_DK.cmake

@@ -11,11 +11,14 @@
 # 3. To use this device with PyOCD you need to install the J-Link software package on your system.
 # 4. As of Sep 2025, PyOCD can flash but cannot reliably debug. Getting 'cannot read register
 #    ipsr because core #0 is not halted'.
+# 5. This upload method configuration reflects version 3 of the DK board, which uses an nRF5340 MCU and does
+#    not have DAPLink firmware available, only J-Link OB. The older version would have had better support for OpenOCD,
+#    Mbed, and PyOCD upload methods but does not seem to be available any more.
 
 
 # General config parameters
 # -------------------------------------------------------------
-set(UPLOAD_METHOD_DEFAULT MBED)
+set(UPLOAD_METHOD_DEFAULT JLINK)
 
 # Config options for MBED
 # -------------------------------------------------------------

tools/python/install_bin_file.py

@@ -74,9 +74,9 @@ def error(lines, code=-1):
                     # Name matches, UID either matches or was not specified
                     all_connected.append(_target)
 
-if len(all_connected) == 0 and len(targets) == 1 and targets[0]['name'] is None:
-    # Special case: if we only have one board connected to the system, then assume it's the one
-    # we want even if we could not detect its name.
+if len(all_connected) == 0 and len(targets) == 1 and targets[0]['name'] is None and target_uid is None:
+    # Special case: if we only have one board connected to the system and we aren't filtering by UID, then
+    # assume it's the one we want even if we could not detect its name.
     all_connected.append(targets[0])
 
 if len(all_connected) == 0: