aboutsummaryrefslogtreecommitdiff
path: root/board/beelink
diff options
context:
space:
mode:
authorGravatar Clément Péron <peron.clem@gmail.com>2020-02-16 22:19:34 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-04-12 23:07:21 +0200
commite0299ebf3f71b1ed6fe7c304fce3f257d38ab9b4 (patch)
treed422bdd010944712b4b38147770f965572fcf533 /board/beelink
parent506740c0306b04de2ce3f5dc79d116f0e5631917 (diff)
downloadbuildroot-e0299ebf3f71b1ed6fe7c304fce3f257d38ab9b4.tar.gz
buildroot-e0299ebf3f71b1ed6fe7c304fce3f257d38ab9b4.tar.bz2
configs/beelink_gs1: bump to ATF v2.2
The WDT workaround patch has been upstreamed. Bump to the new ATF version and drop the patch. Signed-off-by: Clément Péron <peron.clem@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'board/beelink')
-rw-r--r--board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch b/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch
deleted file mode 100644
index 9443fdd568..0000000000
--- a/board/beelink/gs1/patches/arm-trusted-firmware/0001-plat-allwinner-common-use-r_wdog-instead-of-wdog.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 523ab5be1a84e9aa15fb62c3a15a6338b01d3961 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
-Date: Tue, 9 Apr 2019 00:15:06 +0200
-Subject: [PATCH] plat: allwinner: common: use r_wdog instead of wdog
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some Allwinner H6 has a broken watchdog that doesn't
-make the soc reboot.
-
-Use the R_WATCHDOG instead.
-
-Signed-off-by: Clément Péron <peron.clem@gmail.com>
-Change-Id: Ie95cc30a80ed517b60b30d6bc2e655a1b53f18ba
----
- plat/allwinner/common/sunxi_pm.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plat/allwinner/common/sunxi_pm.c b/plat/allwinner/common/sunxi_pm.c
-index 1d2dc938..13e13532 100644
---- a/plat/allwinner/common/sunxi_pm.c
-+++ b/plat/allwinner/common/sunxi_pm.c
-@@ -20,9 +20,9 @@
- #include <sunxi_mmap.h>
- #include <sunxi_private.h>
-
--#define SUNXI_WDOG0_CTRL_REG (SUNXI_WDOG_BASE + 0x0010)
--#define SUNXI_WDOG0_CFG_REG (SUNXI_WDOG_BASE + 0x0014)
--#define SUNXI_WDOG0_MODE_REG (SUNXI_WDOG_BASE + 0x0018)
-+#define SUNXI_WDOG0_CTRL_REG (SUNXI_R_WDOG_BASE + 0x0010)
-+#define SUNXI_WDOG0_CFG_REG (SUNXI_R_WDOG_BASE + 0x0014)
-+#define SUNXI_WDOG0_MODE_REG (SUNXI_R_WDOG_BASE + 0x0018)
-
- #define mpidr_is_valid(mpidr) ( \
- MPIDR_AFFLVL3_VAL(mpidr) == 0 && \
---
-2.20.1
-