Skip to content

Commit 89038ae

Browse files
committed
upgrade to Golioth Zephyr SDK v0.8.0
* Update Kconfig Symbols * Use CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION for DFU version * Remove emergency LTE state Signed-off-by: Mike Szczys <[email protected]>
1 parent 8c1e029 commit 89038ae

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

.github/workflows/build_zephyr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Build with West
4747
run: |
48-
west build -p -b ${{ inputs.BOARD }} app -- -DCONFIG_MCUBOOT_IMAGE_VERSION=\"0.0.0\"
48+
west build -p -b ${{ inputs.BOARD }} app -- -DCONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION=\"0.0.0\"
4949
5050
- name: Create filename prefix
5151
run: echo "PREFIX=golioth-${{ github.event.repository.name }}-${{ inputs.BOARD }}" >> "$GITHUB_ENV"

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ functionality on this Reference Design.
5757

5858
.. code-block:: text
5959
60-
$ (.venv) west build -p -b aludel_mini_v1_sparkfun9160_ns app -- -DCONFIG_MCUBOOT_IMAGE_VERSION=\"<your.semantic.version>\"
60+
$ (.venv) west build -p -b aludel_mini_v1_sparkfun9160_ns app -- -DCONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION=\"<your.semantic.version>\"
6161
$ (.venv) west flash
6262
6363
Configure PSK-ID and PSK using the device shell based on your Golioth
@@ -155,7 +155,7 @@ from above to provision this board after programming the firmware.)
155155

156156
.. code-block:: text
157157
158-
$ (.venv) west build -p -b nrf9160dk_nrf9160_ns app -- -DCONFIG_MCUBOOT_IMAGE_VERSION=\"<your.semantic.version>\"
158+
$ (.venv) west build -p -b nrf9160dk_nrf9160_ns app -- -DCONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION=\"<your.semantic.version>\"
159159
$ (.venv) west flash
160160
161161
External Libraries

boards/aludel_mini_v1_sparkfun9160_ns.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
2222
# LTE connectivity with network connection manager
2323
CONFIG_LTE_CONNECTIVITY=y
2424
CONFIG_NET_CONNECTION_MANAGER=y
25-
CONFIG_NET_CONNECTION_MANAGER_STACK_SIZE=1024
25+
CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
2626

2727
# Increased sysworkq size, due to LTE connectivity
2828
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048

boards/nrf9160dk_nrf9160_ns.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=y
2222
# LTE connectivity with network connection manager
2323
CONFIG_LTE_CONNECTIVITY=y
2424
CONFIG_NET_CONNECTION_MANAGER=y
25-
CONFIG_NET_CONNECTION_MANAGER_STACK_SIZE=1024
25+
CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=1024
2626

2727
# Increased sysworkq size, due to LTE connectivity
2828
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048

src/main.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ static void lte_handler(const struct lte_lc_evt *const evt)
110110
LOG_INF("Network: Registered (roaming)");
111111
process_lte_connected();
112112
break;
113-
case LTE_LC_NW_REG_REGISTERED_EMERGENCY:
114-
LOG_INF("Network: Registered (emergency)");
115-
break;
116113
case LTE_LC_NW_REG_UICC_FAIL:
117114
LOG_INF("Network: UICC fail");
118115
break;
@@ -177,7 +174,7 @@ int main(void)
177174

178175
LOG_DBG("Start Reference Design Template sample");
179176

180-
LOG_INF("Firmware version: %s", CONFIG_MCUBOOT_IMAGE_VERSION);
177+
LOG_INF("Firmware version: %s", CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION);
181178
IF_ENABLED(CONFIG_MODEM_INFO, (log_modem_firmware_version();));
182179

183180
IF_ENABLED(CONFIG_LIB_OSTENTUS, (
@@ -275,7 +272,8 @@ int main(void)
275272
summary_title(SUMMARY_TITLE, strlen(SUMMARY_TITLE));
276273

277274
/* Update the Firmware slide with the firmware version */
278-
slide_set(FIRMWARE, CONFIG_MCUBOOT_IMAGE_VERSION, strlen(CONFIG_MCUBOOT_IMAGE_VERSION));
275+
slide_set(FIRMWARE, CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION,
276+
strlen(CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION));
279277

280278
/* Start Ostentus slideshow with 30 second delay between slides */
281279
slideshow(30000);

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manifest:
77
projects:
88
- name: golioth
99
path: modules/lib/golioth
10-
revision: v0.7.1
10+
revision: v0.8.0
1111
url: https://github.com/golioth/golioth-zephyr-sdk
1212
west-commands: scripts/west-commands.yml
1313
import:

0 commit comments

Comments
 (0)