-
Notifications
You must be signed in to change notification settings - Fork 717
[nrf fromtree] dts: bindings: arm: nordic: Add TDDCONF sources #2039
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
[nrf fromtree] dts: bindings: arm: nordic: Add TDDCONF sources #2039
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a42e290 is not the same as 8fdcf132716136935c990c3496e232a9bec8ce20, a fromlist or fromtree must cleanly apply without any modifications
|
Hi @anangl, you are listed as codeowner. There is a commit upstream that can't apply cleanly downstream because the file diverged downstream. I tried aligning up- and downstream when resolving the conflict in the cherry-pick, so afterwards they will be both aligned. upstream commit: zephyrproject-rtos/zephyr@8fdcf13 The downstream solution of using Given you are the codeowner, can you help me figure out how to best proceed? |
Not really. See zephyrproject-rtos/zephyr#69633 (comment). |
|
@anangl uh good catch, thanks for that. Given this cmake check fails upstream due to the outdated nrf-regtool version in the upstream docker image I'll just drop the version change upstream and only do the suggested noup here to drop the exact. |
a42e290 to
c68c0f7
Compare
|
@nordicjm Could you please have another look if this solution works for you? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Build system change is OK
For nrf54h20 a range of combinations exist to configure the test and debug domains data sources and sinks. Expose them in DTS to allow configuring them. Also drop the previous style which was too rigid to extend to cover all cases cleanly. The old style was only used in a single sample application so far. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 43f9488)
We don't want an exact version match, a minimum one is enough. This aligns it also with the upstream copy of this file. Signed-off-by: Karsten Koenig <[email protected]>
c68c0f7 to
504140f
Compare
|
Because we dropped |
|
Is it not rather that 6.0.0 is needed now and not checked via CMake yet? So I tried kicking off the change upstream But am a bit lost with the upstream docker image, the zephyr builds requiring (at least) nrf-regtool 6.0.0 still fail with 6.0.0 not present in the image. |
For nrf54h20 a range of combinations exist to configure the test and debug domains data sources and sinks. Expose them in DTS to allow configuring them. Also drop the previous style which was too rigid to extend to cover all cases cleanly. The old style was only used in a single sample application so far.
Signed-off-by: Karsten Koenig [email protected]
Upstream PR: zephyrproject-rtos/zephyr#78831