Skip to content

Commit

Permalink
Gecko SDK 4.4.0 build fixes (#43)
Browse files Browse the repository at this point in the history 
* Remove `secondary_` from UART patches

* Replace UART configuration patches

* Renumber patches

* Update OpenThread UART patches

* Install `node` within Z-Wave build container for local building

* Exit successfully if the SDK cannot be patched
  • Loading branch information
@puddly
puddly authored Jan 4, 2024
1 parent ae316d6 commit ce0bf79
Show file tree
Hide file tree
Showing 10 changed files with 281 additions and 149 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/silabs-firmware-build-zwave.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ jobs:
- name: Patch SDK
if: "${{ inputs.sdkpatchpath != '' }}"
run: |
if [ ! -d "${{ inputs.sdkpatchpath }}" ]; then
exit 0
fi
cd ${{ inputs.firmware_name }}/gecko_sdk_${{ inputs.sdk_version }}
for patch in "../../${{ inputs.sdkpatchpath }}"/*.patch
do
Expand Down Expand Up @@ -137,6 +141,13 @@ jobs:
$SIGN_KEY $ENC_KEY \
--compress ${{ inputs.gbl_compression }}
- name: Install node within container (act)
if: ${{ env.ACT }}
shell: bash
run: |
curl -fsSL https://deb.nodesource.com/nsolid_setup_deb.sh | bash -s 20
apt-get install -y nodejs
- uses: actions/upload-artifact@v3
if: success() || failure()
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/silabs-firmware-build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ jobs:
- name: Patch SDK
if: "${{ inputs.sdkpatchpath != '' }}"
run: |
if [ ! -d "${{ inputs.sdkpatchpath }}" ]; then
exit 0
fi
cd ${{ inputs.firmware_name }}/gecko_sdk_${{ inputs.sdk_version }}
for patch in "../../${{ inputs.sdkpatchpath }}"/*.patch
do
Expand Down
0 ...nect-specific-UUID-as-Application-P.patch → ...nect-specific-UUID-as-Application-P.patch
View file
File renamed without changes.
0 ...g-add-board-activity-LED-pin-config.patch → ...g-add-board-activity-LED-pin-config.patch
View file
File renamed without changes.
76 changes: 50 additions & 26 deletions ...configure-usart-vcom-for-SkyConnect.patch → ...dRCP/SkyConnect/0001-Configure-UART.patch
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,77 @@
From 51ef16ec2d80cdf032612159d3d9307639cfc561 Mon Sep 17 00:00:00 2001
Message-Id: <51ef16ec2d80cdf032612159d3d9307639cfc561.1678798117.git.stefan@agner.ch>
From: Stefan Agner <[email protected]>
Date: Tue, 14 Mar 2023 13:26:35 +0100
Subject: [PATCH] config: configure usart vcom for SkyConnect
From aca87d890c1d779add80a9a418f89e30f6d52f6d Mon Sep 17 00:00:00 2001
From: puddly <[email protected]>
Date: Wed, 3 Jan 2024 10:47:37 -0500
Subject: [PATCH] Configure UART

Configure UART
---
config/sl_uartdrv_usart_vcom_config.h | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
config/sl_uartdrv_usart_vcom_config.h | 54 +++++++++++++++-------
1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/config/sl_uartdrv_usart_vcom_config.h b/config/sl_uartdrv_usart_vcom_config.h
index 8a2ab70..7292f1a 100644
index c64b243..bb58433 100644
--- a/config/sl_uartdrv_usart_vcom_config.h
+++ b/config/sl_uartdrv_usart_vcom_config.h
@@ -76,21 +76,24 @@
@@ -89,21 +89,44 @@
// <<< sl:start pin_tool >>>
// <usart signal=TX,RX,(CTS),(RTS)> SL_UARTDRV_USART_VCOM
// $[USART_SL_UARTDRV_USART_VCOM]
-#warning "UARTDRV USART peripheral not configured"
-// #define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0
-// #define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0

-
-// #define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_TX_PIN 0
+// USART0 TX on PA05
+#define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA
+#define SL_UARTDRV_USART_VCOM_TX_PIN 6

-
-// #define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_RX_PIN 1
+// USART0 RX on PA06
+#define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA
+#define SL_UARTDRV_USART_VCOM_RX_PIN 5

-
-// #define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_CTS_PIN 2
+// USART0 CTS on PD02
+#define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortB
+#define SL_UARTDRV_USART_VCOM_CTS_PIN 1

-
-// #define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_RTS_PIN 3
+// USART0 RTS on PC01
+#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL_NO
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0
+#endif
+
+// USART0 TX on PA06
+#ifndef SL_UARTDRV_USART_VCOM_TX_PORT
+#define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_TX_PIN
+#define SL_UARTDRV_USART_VCOM_TX_PIN 6
+#endif
+
+// USART0 RX on PA05
+#ifndef SL_UARTDRV_USART_VCOM_RX_PORT
+#define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_RX_PIN
+#define SL_UARTDRV_USART_VCOM_RX_PIN 5
+#endif
+
+// USART0 CTS on PB01
+#ifndef SL_UARTDRV_USART_VCOM_CTS_PORT
+#define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortB
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_CTS_PIN
+#define SL_UARTDRV_USART_VCOM_CTS_PIN 1
+#endif
+
+// USART0 RTS on PB00
+#ifndef SL_UARTDRV_USART_VCOM_RTS_PORT
+#define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortB
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_RTS_PIN
+#define SL_UARTDRV_USART_VCOM_RTS_PIN 0
+#endif
// [USART_SL_UARTDRV_USART_VCOM]$
// <<< sl:end pin_tool >>>

--
2.39.2
2.43.0

68 changes: 46 additions & 22 deletions ...fig-configure-usart-vcom-for-Yellow.patch → ...hreadRCP/Yellow/0001-Configure-UART.patch
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,77 @@
From 05cfb71f684cf20e48c51eefaf301cce035f0c64 Mon Sep 17 00:00:00 2001
Message-Id: <05cfb71f684cf20e48c51eefaf301cce035f0c64.1678797714.git.stefan@agner.ch>
From: Stefan Agner <[email protected]>
Date: Tue, 14 Mar 2023 13:26:35 +0100
Subject: [PATCH] config: configure usart vcom for Yellow
From aca87d890c1d779add80a9a418f89e30f6d52f6d Mon Sep 17 00:00:00 2001
From: puddly <[email protected]>
Date: Wed, 3 Jan 2024 10:47:37 -0500
Subject: [PATCH] Configure UART

Configure UART
---
config/sl_uartdrv_usart_vcom_config.h | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
config/sl_uartdrv_usart_vcom_config.h | 54 +++++++++++++++-------
1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/config/sl_uartdrv_usart_vcom_config.h b/config/sl_uartdrv_usart_vcom_config.h
index 8a2ab70..5caf982 100644
index c64b243..bb58433 100644
--- a/config/sl_uartdrv_usart_vcom_config.h
+++ b/config/sl_uartdrv_usart_vcom_config.h
@@ -76,21 +76,24 @@
@@ -89,21 +89,44 @@
// <<< sl:start pin_tool >>>
// <usart signal=TX,RX,(CTS),(RTS)> SL_UARTDRV_USART_VCOM
// $[USART_SL_UARTDRV_USART_VCOM]
-#warning "UARTDRV USART peripheral not configured"
-// #define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0
-// #define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0

-
-// #define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_TX_PIN 0
-
-// #define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_RX_PIN 1
-
-// #define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_CTS_PIN 2
-
-// #define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_RTS_PIN 3
+#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL USART0
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_PERIPHERAL_NO
+#define SL_UARTDRV_USART_VCOM_PERIPHERAL_NO 0
+#endif
+
+// USART0 TX on PA05
+#ifndef SL_UARTDRV_USART_VCOM_TX_PORT
+#define SL_UARTDRV_USART_VCOM_TX_PORT gpioPortA
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_TX_PIN
+#define SL_UARTDRV_USART_VCOM_TX_PIN 5

-// #define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_RX_PIN 1
+#endif
+
+// USART0 RX on PA06
+#ifndef SL_UARTDRV_USART_VCOM_RX_PORT
+#define SL_UARTDRV_USART_VCOM_RX_PORT gpioPortA
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_RX_PIN
+#define SL_UARTDRV_USART_VCOM_RX_PIN 6

-// #define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_CTS_PIN 2
+#endif
+
+// USART0 CTS on PD02
+#ifndef SL_UARTDRV_USART_VCOM_CTS_PORT
+#define SL_UARTDRV_USART_VCOM_CTS_PORT gpioPortD
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_CTS_PIN
+#define SL_UARTDRV_USART_VCOM_CTS_PIN 2

-// #define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortA
-// #define SL_UARTDRV_USART_VCOM_RTS_PIN 3
+#endif
+
+// USART0 RTS on PC01
+#ifndef SL_UARTDRV_USART_VCOM_RTS_PORT
+#define SL_UARTDRV_USART_VCOM_RTS_PORT gpioPortC
+#endif
+#ifndef SL_UARTDRV_USART_VCOM_RTS_PIN
+#define SL_UARTDRV_USART_VCOM_RTS_PIN 1
+#endif
// [USART_SL_UARTDRV_USART_VCOM]$
// <<< sl:end pin_tool >>>

--
2.39.2
2.43.0

85 changes: 85 additions & 0 deletions RCPMultiPAN/SkyConnect/0001-Configure-UART.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
From aca87d890c1d779add80a9a418f89e30f6d52f6d Mon Sep 17 00:00:00 2001
From: puddly <[email protected]>
Date: Wed, 3 Jan 2024 10:47:37 -0500
Subject: [PATCH] Configure UART

Configure UART
---
config/sl_cpc_drv_uart_usart_vcom_config.h | 54 +++++++++++++++-------
1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/config/sl_cpc_drv_uart_usart_vcom_config.h b/config/sl_cpc_drv_uart_usart_vcom_config.h
index 265c262..bb0d7d5 100644
--- a/config/sl_cpc_drv_uart_usart_vcom_config.h
+++ b/config/sl_cpc_drv_uart_usart_vcom_config.h
@@ -29,7 +29,6 @@
******************************************************************************/

// <<< Use Configuration Wizard in Context Menu >>>
-
#ifndef SL_CPC_DRV_UART_USART_VCOM_CONFIG_H
#define SL_CPC_DRV_UART_USART_VCOM_CONFIG_H

@@ -59,21 +58,44 @@
// <<< sl:start pin_tool >>>
// <usart signal=TX,RX,(CTS),(RTS)> SL_CPC_DRV_UART_VCOM
// $[USART_SL_CPC_DRV_UART_VCOM]
-#warning "CPC USART peripheral not configured"
-// #define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0
-// #define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0
-//
-// #define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortD
-// #define SL_CPC_DRV_UART_VCOM_TX_PIN 13
-//
-// #define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortD
-// #define SL_CPC_DRV_UART_VCOM_RX_PIN 14
-//
-// #define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortD
-// #define SL_CPC_DRV_UART_VCOM_CTS_PIN 13
-//
-// #define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortD
-// #define SL_CPC_DRV_UART_VCOM_RTS_PIN 14
+#ifndef SL_CPC_DRV_UART_VCOM_PERIPHERAL
+#define SL_CPC_DRV_UART_VCOM_PERIPHERAL USART0
+#endif
+#ifndef SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO
+#define SL_CPC_DRV_UART_VCOM_PERIPHERAL_NO 0
+#endif
+
+// USART0 TX on PA06
+#ifndef SL_CPC_DRV_UART_VCOM_TX_PORT
+#define SL_CPC_DRV_UART_VCOM_TX_PORT gpioPortA
+#endif
+#ifndef SL_CPC_DRV_UART_VCOM_TX_PIN
+#define SL_CPC_DRV_UART_VCOM_TX_PIN 6
+#endif
+
+// USART0 RX on PA05
+#ifndef SL_CPC_DRV_UART_VCOM_RX_PORT
+#define SL_CPC_DRV_UART_VCOM_RX_PORT gpioPortA
+#endif
+#ifndef SL_CPC_DRV_UART_VCOM_RX_PIN
+#define SL_CPC_DRV_UART_VCOM_RX_PIN 5
+#endif
+
+// USART0 CTS on PB01
+#ifndef SL_CPC_DRV_UART_VCOM_CTS_PORT
+#define SL_CPC_DRV_UART_VCOM_CTS_PORT gpioPortB
+#endif
+#ifndef SL_CPC_DRV_UART_VCOM_CTS_PIN
+#define SL_CPC_DRV_UART_VCOM_CTS_PIN 1
+#endif
+
+// USART0 RTS on PB00
+#ifndef SL_CPC_DRV_UART_VCOM_RTS_PORT
+#define SL_CPC_DRV_UART_VCOM_RTS_PORT gpioPortB
+#endif
+#ifndef SL_CPC_DRV_UART_VCOM_RTS_PIN
+#define SL_CPC_DRV_UART_VCOM_RTS_PIN 0
+#endif
// [USART_SL_CPC_DRV_UART_VCOM]$
// <<< sl:end pin_tool >>>

--
2.43.0

51 changes: 0 additions & 51 deletions RCPMultiPAN/SkyConnect/0001-config-configure-cpc-usart-vcom-for-SkyConnect.patch
View file

This file was deleted.

Loading

0 comments on commit ce0bf79

Please sign in to comment.