]> git.baikalelectronics.ru Git - uboot.git/commit
sunxi: f1c100s: re-enable SYSRESET
authorAndre Przywara <andre.przywara@arm.com>
Fri, 16 Dec 2022 23:34:47 +0000 (23:34 +0000)
committerAndre Przywara <andre.przywara@arm.com>
Sat, 21 Jan 2023 01:32:23 +0000 (01:32 +0000)
commitb7e65d09e8955c54b769cc06281e3ec61721be45
tree750c15448509a5d0f564c64d3836ad6203e8599f
parente40ae536d8960449d5903b7a2faa8dfe4d89a65c
sunxi: f1c100s: re-enable SYSRESET

The SoC .dtsi originally submitted for the Allwinner F1C100s had the
wrong compatible string for the watchdog, which broke U-Boot's reset
functionality. To quickly fix this, we disable CONFIG_SYSRESET in
1b79d4134a7b18122752e ("sunxi: f1c100s: Drop SYSRESET to enable reset
functionality"), so that U-Boot's hardcoded reset driver could take over.

After this was properly fixed in the devicetree, we reverted that patch
in 8bbc5dedb0be ("Revert "sunxi: f1c100s: Drop SYSRESET to enable reset
functionality"), however this line sneaked back in with 7f5ec132ec48
("Convert CONFIG_SYS_PBSIZE to Kconfig"), so during a Kconfig update.

Remove this line (again), to use the proper reset driver.

Fixes: 7f5ec132ec48 ("Convert CONFIG_SYS_PBSIZE to Kconfig")
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Samuel Holland <samuel@sholland.org>
configs/licheepi_nano_defconfig