ARM: ni-slsc-12001: Enable system watchdog and defconfig regeneration.#231
Merged
gratian merged 2 commits intoni:nilrt/master/6.6from Apr 30, 2025
Merged
Conversation
Using cadence watchdog to allow system to reboot when hangs for more than 10 sec. - Using phandle reference @watchdog0 to add reset-on-timeout property to cadence watchdog in ni-slsc-12001.dts - Regenerate nati-slsc-defconfig with savedefconfig to clear some previous manual edits. And add cadence watchdog driver support. Signed-off-by: George Huang <george.huang@ni.com> Acked-by: Brad Mouring <brad.mouring@ni.com> Acked-by: Brad Keryan <brad.keryan@emerson.com> Acked-by: Josh Cartwright <josh.cartwright@ni.com> Acked-by: Gratian Crisan <gratian.crisan@ni.com> Natinst-ReviewBoard-ID 149067 Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
regenerate nati_slsc_defconfig for kernel 6.6 Signed-off-by: Kae Woei Kang <kae.woei.kang@emerson.com>
kkang-NI
force-pushed
the
dev/kkang/slsc_watchdog_on_defconfig_dts
branch
from
1bcd58a to
519d16b
Compare
kkang-NI
changed the title
kkang-NI
commented
Apr 30, 2025
| @@ -1,10 +1,7 @@ | |||
| CONFIG_LOCALVERSION="-ni" | |||
Author
There was a problem hiding this comment.
Step to regenerate defconfig:
- make nati_slsc_defconfig
- make savedefconfig
- Copy the resulting 'defconfig' file over the nati_slsc_defconfig
gratian
approved these changes
Apr 30, 2025
chaitu236
approved these changes
Apr 30, 2025
|
Cherry picked in |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cherry picked commit 01206af5a8ba.
regenerated nati_slsc_defconfig for kernel 6.6.
WI: AB#3014046
testing: able build passed in local. Image file generated.