summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2022-12-17 02:34:47 +0300
committerAndre Przywara <andre.przywara@arm.com>2023-01-21 04:32:23 +0300
commit493e874b8d2971de709bd377cd2219235447e67a (patch)
tree750c15448509a5d0f564c64d3836ad6203e8599f /configs
parentdd31cd58b02729807934cb699b164b1f8736620f (diff)
downloadu-boot-493e874b8d2971de709bd377cd2219235447e67a.tar.xz
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>
Diffstat (limited to 'configs')
-rw-r--r--configs/licheepi_nano_defconfig1
1 files changed, 0 insertions, 1 deletions
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