Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boards: add thingy91x board #13379

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Conversation

maxd-nordic
Copy link
Contributor

@maxd-nordic maxd-nordic commented Dec 8, 2023

This patch adds board files for the Thingy:91 X.

The required changes to Zephyr and MCUBoot have been merged!
We're ready to go!

@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Dec 8, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Dec 8, 2023

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
test-fw-nrfconnect-boot X
test-fw-nrfconnect-fw-update X
test-sdk-wifi X

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@maxd-nordic
Copy link
Contributor Author

Note: We have to make sure to make a distinction between PCA20064 and PCA20065 (newer version that is planned to be the main release).

@maxd-nordic
Copy link
Contributor Author

PRs that need to be handled before this can be finished:
nrfconnect/sdk-mcuboot#291
zephyrproject-rtos/zephyr#63395
zephyrproject-rtos/zephyr#63394 (available upstream)
zephyrproject-rtos/zephyr#63162 (available upstream)
ADXL367 support https://github.com/zephyrproject-rtos/zephyr/pulls?q=is%3Apr+is%3Aclosed+adxl367 (available upstream)

boards/arm/thingy91x_nrf5340/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/arm/thingy91x_nrf5340/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/arm/thingy91x_nrf5340/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/arm/thingy91x_nrf5340/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/arm/thingy91x_nrf9161/Kconfig.defconfig Outdated Show resolved Hide resolved
boards/arm/thingy91x_nrf9161/thingy91x_nrf9161.yaml Outdated Show resolved Hide resolved
boards/arm/thingy91x_nrf9161/thingy91x_nrf9161_common.dts Outdated Show resolved Hide resolved
};
};

/* Disable Zephyr driver for UART1. The nrfx driver is used for interfacing with UART1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is outdated. The UART trace backend now uses the Zephyr driver depending on the device tree chosen node for modem traces:

	chosen {
		nordic,modem-trace-uart = &uart1;
	};

So it depends on if we want modem traces to be enabled by default or not. It might make sense to disable by default for battery usage, and use a snippet to enable when needed. But perhaps set the default directly in thingy91x_nrf9161_common.dts? Or does it need to differ between secure/non secure?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to comment to make clear why this is disabled by default in non-secure.

boards/arm/thingy91x_nrf9161/thingy91x_nrf9161_ns.yaml Outdated Show resolved Hide resolved
@balaji-srin balaji-srin removed their request for review December 13, 2023 12:32
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@maxd-nordic
Copy link
Contributor Author

I decided to remove MCUBoot serial recovery from the nrf91 image since we will ship with a debugger.
This enables us to see logs of the second boot stage.

@maxd-nordic
Copy link
Contributor Author

the zephyr fork now only contains fromtree commits! Only need to update Zephyr (and add stuff to mcuboot) for basic support of the device now.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Jan 22, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@beebb23 (upmerge-tmp) nrfconnect/sdk-mcuboot#294 nrfconnect/sdk-mcuboot#294/files

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@maxd-nordic
Copy link
Contributor Author

rebased an squashed - ready from my point of view

@balaji-srin balaji-srin self-requested a review February 5, 2024 10:02
@maxd-nordic maxd-nordic force-pushed the thingy91x_board_pr branch 6 times, most recently from 7005824 to 9741f56 Compare February 8, 2024 09:08
@maxd-nordic
Copy link
Contributor Author

touched up the headers to make sure license remarks are present and consistent

Copy link

@balaji-srin balaji-srin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified by building and testing samples on both 9151 and 5340 chip.

This patch adds board files for the Thingy:91 X.

Signed-off-by: Bernt Johan Damslora <[email protected]>
Signed-off-by: Maximilian Deubel <[email protected]>
@maxd-nordic maxd-nordic removed DNM manifest manifest-mcuboot changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Feb 12, 2024
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Feb 12, 2024
@maxd-nordic maxd-nordic removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Feb 12, 2024
@nordicjm nordicjm merged commit 897cea4 into nrfconnect:main Feb 12, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants