]> git.dujemihanovic.xyz Git - u-boot.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)
commit493e874b8d2971de709bd377cd2219235447e67a
tree750c15448509a5d0f564c64d3836ad6203e8599f
parentdd31cd58b02729807934cb699b164b1f8736620f
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
cfcf1952c11e6ffcbbf88 ("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 92373de041ea ("Revert "sunxi: f1c100s: Drop SYSRESET to enable reset
functionality"), however this line sneaked back in with d0ee7f295d74
("Convert CONFIG_SYS_PBSIZE to Kconfig"), so during a Kconfig update.

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

Fixes: d0ee7f295d74 ("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