From: Andre Przywara Date: Fri, 16 Dec 2022 23:34:47 +0000 (+0000) Subject: sunxi: f1c100s: re-enable SYSRESET X-Git-Tag: baikal/mips/sdk5.8.2~5^2~78^2~14 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=b7e65d09e8955c54b769cc06281e3ec61721be45;p=uboot.git 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 Reviewed-by: Samuel Holland --- diff --git a/configs/licheepi_nano_defconfig b/configs/licheepi_nano_defconfig index 12a43c1ec1..b25c9ba77c 100644 --- a/configs/licheepi_nano_defconfig +++ b/configs/licheepi_nano_defconfig @@ -10,4 +10,3 @@ CONFIG_SPL_SPI_SUNXI=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_XTX=y CONFIG_SPI=y -# CONFIG_SYSRESET is not set