You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2022/08/31 10:14:21 UTC
[mynewt-core] 02/04: bsp/nordic_pca10121: Update bsp
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 72e5f8f7a85cdbe504cf49235bad318674d487f6
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Tue Aug 23 08:18:01 2022 +0200
bsp/nordic_pca10121: Update bsp
Changes from pca10095:
- file names
- pins
---
hw/bsp/nordic_pca10121/bsp.yml | 13 +++---
.../{nordic_pca10095_debug.sh => debug.sh} | 0
.../{nordic_pca10095_download.sh => download.sh} | 0
hw/bsp/nordic_pca10121/include/bsp/bsp.h | 48 ++++++++++++----------
.../{nordic_pca10095_no_boot.ld => no_boot.ld} | 0
hw/bsp/nordic_pca10121/pkg.yml | 4 +-
hw/bsp/nordic_pca10121/syscfg.yml | 13 ++++--
7 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/hw/bsp/nordic_pca10121/bsp.yml b/hw/bsp/nordic_pca10121/bsp.yml
index be1b9faf3..148bf85b1 100644
--- a/hw/bsp/nordic_pca10121/bsp.yml
+++ b/hw/bsp/nordic_pca10121/bsp.yml
@@ -17,20 +17,19 @@
# under the License.
#
-bsp.name: "nRF5340 PDK"
-bsp.url: https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK
+bsp.name: "nRF5340 Audio DK"
+bsp.url: https://www.nordicsemi.com/Products/Development-hardware/nRF5340-Audio-DK
bsp.maker: "Nordic Semiconductor"
bsp.arch: cortex_m33
bsp.compiler: "@apache-mynewt-core/compiler/arm-none-eabi-m33"
bsp.linkerscript:
- - "hw/bsp/nordic_pca10095/nrf5340.ld"
+ - "hw/bsp/nordic_pca10121/nrf5340.ld"
- "@apache-mynewt-core/hw/mcu/nordic/nrf5340/nrf5340.ld"
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- - "hw/bsp/nordic_pca10095/boot-nrf5340.ld"
+ - "hw/bsp/nordic_pca10121/boot-nrf5340.ld"
- "@apache-mynewt-core/hw/mcu/nordic/nrf5340/nrf5340.ld"
-bsp.part2linkerscript: "hw/bsp/nordic_pca10095/split-nordic_pca10095.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10095/nordic_pca10095_download.sh"
-bsp.debugscript: "hw/bsp/nordic_pca10095/nordic_pca10095_debug.sh"
+bsp.downloadscript: "hw/bsp/nordic_pca10121/download.sh"
+bsp.debugscript: "hw/bsp/nordic_pca10121/debug.sh"
bsp.flash_map:
areas:
diff --git a/hw/bsp/nordic_pca10121/nordic_pca10095_debug.sh b/hw/bsp/nordic_pca10121/debug.sh
similarity index 100%
rename from hw/bsp/nordic_pca10121/nordic_pca10095_debug.sh
rename to hw/bsp/nordic_pca10121/debug.sh
diff --git a/hw/bsp/nordic_pca10121/nordic_pca10095_download.sh b/hw/bsp/nordic_pca10121/download.sh
similarity index 100%
rename from hw/bsp/nordic_pca10121/nordic_pca10095_download.sh
rename to hw/bsp/nordic_pca10121/download.sh
diff --git a/hw/bsp/nordic_pca10121/include/bsp/bsp.h b/hw/bsp/nordic_pca10121/include/bsp/bsp.h
index ee66354b8..47ae71b75 100644
--- a/hw/bsp/nordic_pca10121/include/bsp/bsp.h
+++ b/hw/bsp/nordic_pca10121/include/bsp/bsp.h
@@ -38,33 +38,39 @@ extern uint8_t _ram_start;
#define RAM_SIZE 0x80000
/* LED pins */
-#define LED_1 (28)
-#define LED_2 (29)
-#define LED_3 (30)
-#define LED_4 (31)
-#define LED_BLINK_PIN (LED_1)
+#define LED_1 31
+#define LED_2 32
+#define LED_3 33
+#define RGB_LED_1_RED 7
+#define RGB_LED_1_GREEN 25
+#define RGB_LED_1_BLUE 26
+#define RGB_LED_2_RED 28
+#define RGB_LED_2_GREEN 29
+#define RGB_LED_2_BLUE 30
+#define LED_BLINK_PIN (LED_1)
/* Buttons */
-#define BUTTON_1 (23)
-#define BUTTON_2 (24)
-#define BUTTON_3 (8)
-#define BUTTON_4 (9)
+#define BUTTON_1 2
+#define BUTTON_2 3
+#define BUTTON_3 4
+#define BUTTON_4 6
+#define BUTTON_5 5
/* Arduino pins */
-#define ARDUINO_PIN_D0 32
-#define ARDUINO_PIN_D1 33
-#define ARDUINO_PIN_D2 36
-#define ARDUINO_PIN_D3 37
-#define ARDUINO_PIN_D4 38
-#define ARDUINO_PIN_D5 39
-#define ARDUINO_PIN_D6 40
-#define ARDUINO_PIN_D7 41
+#define ARDUINO_PIN_D0 41
+#define ARDUINO_PIN_D1 42
+#define ARDUINO_PIN_D2 31
+#define ARDUINO_PIN_D3 32
+#define ARDUINO_PIN_D4 33
+#define ARDUINO_PIN_D5 46
+#define ARDUINO_PIN_D6 39
+#define ARDUINO_PIN_D7 43
#define ARDUINO_PIN_D8 42
-#define ARDUINO_PIN_D9 43
+#define ARDUINO_PIN_D9 45
#define ARDUINO_PIN_D10 44
-#define ARDUINO_PIN_D11 45
-#define ARDUINO_PIN_D12 46
-#define ARDUINO_PIN_D13 47
+#define ARDUINO_PIN_D11 9
+#define ARDUINO_PIN_D12 10
+#define ARDUINO_PIN_D13 8
#define ARDUINO_PIN_A0 4
#define ARDUINO_PIN_A1 5
#define ARDUINO_PIN_A2 6
diff --git a/hw/bsp/nordic_pca10121/nordic_pca10095_no_boot.ld b/hw/bsp/nordic_pca10121/no_boot.ld
similarity index 100%
rename from hw/bsp/nordic_pca10121/nordic_pca10095_no_boot.ld
rename to hw/bsp/nordic_pca10121/no_boot.ld
diff --git a/hw/bsp/nordic_pca10121/pkg.yml b/hw/bsp/nordic_pca10121/pkg.yml
index 53bf2693c..b47db39a9 100644
--- a/hw/bsp/nordic_pca10121/pkg.yml
+++ b/hw/bsp/nordic_pca10121/pkg.yml
@@ -17,9 +17,9 @@
# under the License.
#
-pkg.name: hw/bsp/nordic_pca10095
+pkg.name: hw/bsp/nordic_pca10121
pkg.type: bsp
-pkg.description: BSP definition for the Nordic PCA10095 (nRF5340 DK)
+pkg.description: BSP definition for the Nordic PCA10121 (nRF5340 Audio DK)
pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
pkg.homepage: "http://mynewt.apache.org/"
pkg.keywords:
diff --git a/hw/bsp/nordic_pca10121/syscfg.yml b/hw/bsp/nordic_pca10121/syscfg.yml
index d0b287647..ebfbb24b4 100644
--- a/hw/bsp/nordic_pca10121/syscfg.yml
+++ b/hw/bsp/nordic_pca10121/syscfg.yml
@@ -45,10 +45,15 @@ syscfg.defs:
syscfg.vals:
# Set default pins for peripherals
- UART_0_PIN_TX: 20
- UART_0_PIN_RX: 22
- UART_0_PIN_RTS: 19
- UART_0_PIN_CTS: 21
+ UART_0_PIN_TX: 37
+ UART_0_PIN_RX: 36
+ UART_0_PIN_RTS: 39
+ UART_0_PIN_CTS: 38
+
+ UART_1_PIN_TX: 41
+ UART_1_PIN_RX: 40
+ UART_1_PIN_RTS: 43
+ UART_1_PIN_CTS: 42
SPI_0_MASTER_PIN_SCK: 45
SPI_0_MASTER_PIN_MOSI: 46