Skip to content

Conversation

@kkang-NI
Copy link

@kkang-NI kkang-NI commented Apr 29, 2025

cherry picked commit 01206af5a8ba.
regenerated nati_slsc_defconfig for kernel 6.6.

WI: AB#3014046

testing: able build passed in local. Image file generated.

George Huang and others added 2 commits April 29, 2025 14:14
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 kkang-NI force-pushed the dev/kkang/slsc_watchdog_on_defconfig_dts branch from 1bcd58a to 519d16b Compare April 29, 2025 06:15
@kkang-NI kkang-NI changed the title [WIP] ARM: ni-slsc-12001: Enable system watchdog and defconfig regeneration. ARM: ni-slsc-12001: Enable system watchdog and defconfig regeneration. Apr 30, 2025
@kkang-NI kkang-NI marked this pull request as ready for review April 30, 2025 05:43
@@ -1,10 +1,7 @@
CONFIG_LOCALVERSION="-ni"
Copy link
Author

Choose a reason for hiding this comment

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

Step to regenerate defconfig:

  1. make nati_slsc_defconfig
  2. make savedefconfig
  3. Copy the resulting 'defconfig' file over the nati_slsc_defconfig

@gratian gratian requested a review from a team April 30, 2025 14:58
@gratian gratian merged commit 519d16b into ni:nilrt/master/6.6 Apr 30, 2025
1 check passed
@gratian
Copy link

gratian commented Apr 30, 2025

Cherry picked in nilrt/master/6.12

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.

3 participants