Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
u-boot
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
u-boot
Commits
a40381ae
Commit
a40381ae
authored
May 30, 2020
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgraded u-boot to 2020.04 to get support of Python 3
parent
d8074b6e
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
261 additions
and
246 deletions
+261
-246
Makefile
Makefile
+142
-146
u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
...19.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
+0
-18
u-boot-2020.04-boot_from_mmc1.patch
u-boot-2020.04-boot_from_mmc1.patch
+12
-0
u-boot-2020.04-mender.patch
u-boot-2020.04-mender.patch
+69
-45
u-boot-2020.04-serial-number-fix.patch
u-boot-2020.04-serial-number-fix.patch
+9
-9
u-boot-2020.04-sunxi_env_in_mmc0.patch
u-boot-2020.04-sunxi_env_in_mmc0.patch
+4
-4
u-boot-2020.04-sunxi_wdt.patch
u-boot-2020.04-sunxi_wdt.patch
+25
-24
u-boot-2020.04.tar.bz2
u-boot-2020.04.tar.bz2
+0
-0
No files found.
Makefile
View file @
a40381ae
This diff is collapsed.
Click to expand it.
u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
deleted
100644 → 0
View file @
d8074b6e
diff -uNr u-boot-2019.04/arch/arm/mach-sunxi/clock_sun6i.c u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c
--- u-boot-2019.04/arch/arm/mach-sunxi/clock_sun6i.c 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c 2019-09-01 10:49:11.867320183 +0930
@@ -115,11 +115,10 @@
int k = 1;
int m = 1;
- if (clk > 1152000000) {
- k = 2;
- } else if (clk > 768000000) {
+ if (clk >= 1368000000) {
k = 3;
- m = 2;
+ } else if (clk >= 768000000) {
+ k = 2;
}
/* Switch to 24MHz clock while changing PLL1 */
u-boot-20
19
.04-boot_from_mmc1.patch
→
u-boot-20
20
.04-boot_from_mmc1.patch
View file @
a40381ae
diff -uNr u-boot-20
19.04/include/config_mender_defines.h u-boot-2019
.04-boot_from_mmc1/include/config_mender_defines.h
--- u-boot-20
19.04/include/config_mender_defines.h 2020-03-05 13:35:37.709211780 +10
30
+++ u-boot-20
19.04-boot_from_mmc1/include/config_mender_defines.h 2020-03-05 13:39:02.755576198 +10
30
diff -uNr u-boot-20
20.04/include/config_mender_defines.h u-boot-2020
.04-boot_from_mmc1/include/config_mender_defines.h
--- u-boot-20
20.04/include/config_mender_defines.h 2020-05-30 20:14:13.527252484 +09
30
+++ u-boot-20
20.04-boot_from_mmc1/include/config_mender_defines.h 2020-05-30 20:40:22.384134573 +09
30
@@ -3,7 +3,7 @@
#define MENDER_ROOTFS_PART_A_NUMBER 2
#define MENDER_ROOTFS_PART_B_NUMBER 3
...
...
u-boot-20
19
.04-mender.patch
→
u-boot-20
20
.04-mender.patch
View file @
a40381ae
diff -uNr u-boot-2019.04/env/Kconfig u-boot-2019.04-mender/env/Kconfig
--- u-boot-2019.04/env/Kconfig 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-mender/env/Kconfig 2020-04-17 11:05:40.302138528 +0930
@@ -473,14 +473,8 @@
if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
diff -uNr u-boot-2020.04/configs/p212_defconfig u-boot-2020.04-mender/configs/p212_defconfig
--- u-boot-2020.04/configs/p212_defconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/configs/p212_defconfig 2020-05-30 20:33:19.766074670 +0930
@@ -1,7 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_MESON=y
CONFIG_SYS_TEXT_BASE=0x01000000
-CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_SIZE=0x20000
CONFIG_DM_GPIO=y
CONFIG_MESON_GXL=y
CONFIG_NR_DRAM_BANKS=1
diff -uNr u-boot-2020.04/configs/rpi_3_defconfig u-boot-2020.04-mender/configs/rpi_3_defconfig
--- u-boot-2020.04/configs/rpi_3_defconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/configs/rpi_3_defconfig 2020-05-30 20:35:38.147421723 +0930
@@ -4,7 +4,7 @@
CONFIG_SYS_TEXT_BASE=0x00080000
CONFIG_TARGET_RPI_3=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_ENV_SIZE=0x4000
+CONFIG_ENV_SIZE=0x20000
CONFIG_NR_DRAM_BANKS=1
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
diff -uNr u-boot-2020.04/env/Kconfig u-boot-2020.04-mender/env/Kconfig
--- u-boot-2020.04/env/Kconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/env/Kconfig 2020-05-30 20:21:45.096362246 +0930
@@ -488,18 +488,8 @@
environment location.
config ENV_OFFSET
- hex "Environment Offset"
- depends on !ENV_IS_IN_UBI
- depends on !ENV_IS_NOWHERE
- default 0x3f8000 if ARCH_ROCKCHIP
- hex "Environment offset"
- depends on ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \
- ENV_IS_IN_SPI_FLASH
- default 0x3f8000 if ARCH_ROCKCHIP && ENV_IS_IN_MMC
- default 0x140000 if ARCH_ROCKCHIP && ENV_IS_IN_SPI_FLASH
- default 0x88000 if ARCH_SUNXI
- default 0xE0000 if ARCH_ZYNQ
- default 0x1E00000 if ARCH_ZYNQMP
- default 0x7F40000 if ARCH_VERSAL
- default 0 if ARC
- default 0x140000 if ARCH_AT91
- default 0x260000 if ARCH_OMAP2PLUS
+ hex "Environment Offset will be set by mender patch"
+ depends on !ARCH_SUNXI
help
Offset from the start of the device (or partition)
diff -uNr u-boot-20
19.04/include/config_mender_defines.h u-boot-2019
.04-mender/include/config_mender_defines.h
--- u-boot-20
19
.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
19.04-mender/include/config_mender_defines.h 2020-04-17 11:05:40.304138535
+0930
diff -uNr u-boot-20
20.04/include/config_mender_defines.h u-boot-2020
.04-mender/include/config_mender_defines.h
--- u-boot-20
20
.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
20.04-mender/include/config_mender_defines.h 2020-05-30 20:14:13.527252484
+0930
@@ -0,0 +1,17 @@
+/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1
...
...
@@ -39,9 +67,9 @@ diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/i
+
+/* For sanity checks. */
+#define MENDER_BOOTENV_SIZE 0x20000
diff -uNr u-boot-20
19.04/include/config_mender.h u-boot-2019
.04-mender/include/config_mender.h
--- u-boot-20
19
.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
19.04-mender/include/config_mender.h 2020-04-17 11:05:40.304138535
+0930
diff -uNr u-boot-20
20.04/include/config_mender.h u-boot-2020
.04-mender/include/config_mender.h
--- u-boot-20
20
.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
20.04-mender/include/config_mender.h 2020-05-30 20:14:13.527252484
+0930
@@ -0,0 +1,83 @@
+/*
+ Copyright 2017 Northern.tech AS
...
...
@@ -126,37 +154,33 @@ diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/c
+#endif /* !MENDER_AUTO_PROBING */
+
+#endif /* HEADER_CONFIG_MENDER_H */
diff -uNr u-boot-20
19.04/include/configs/meson64.h u-boot-2019
.04-mender/include/configs/meson64.h
--- u-boot-20
19.04/include/configs/meson64.h 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-mender/include/configs/meson64.h 2020-04-17 11:04:59.329998736
+0930
@@ -3
8,7 +38,9
@@
diff -uNr u-boot-20
20.04/include/configs/meson64.h u-boot-2020
.04-mender/include/configs/meson64.h
--- u-boot-20
20.04/include/configs/meson64.h 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-mender/include/configs/meson64.h 2020-05-30 20:31:28.306795518
+0930
@@ -3
7,6 +37,8
@@
#define CONFIG_CPU_ARMV8
#define CONFIG_REMAKE_ELF
-#define CONFIG_ENV_SIZE 0x2000
+#define CONFIG_ENV_SIZE 0x20000
+#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_BOOTCOUNT_ENV
#define CONFIG_SYS_MAXARGS 32
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024
diff -uNr u-boot-20
19.04/include/configs/rpi.h u-boot-2019
.04-mender/include/configs/rpi.h
--- u-boot-20
19.04/include/configs/rpi.h 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-mender/include/configs/rpi.h 2020-04-17 11:05:40.304138535
+0930
@@ -
71,7 +71,9
@@
diff -uNr u-boot-20
20.04/include/configs/rpi.h u-boot-2020
.04-mender/include/configs/rpi.h
--- u-boot-20
20.04/include/configs/rpi.h 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-mender/include/configs/rpi.h 2020-05-30 20:31:51.976854499
+0930
@@ -
97,6 +97,8
@@
#define CONFIG_SYS_CBSIZE 1024
/* Environment */
-#define CONFIG_ENV_SIZE SZ_16K
+#define CONFIG_ENV_SIZE SZ_128K
+#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_BOOTCOUNT_ENV
#define CONFIG_SYS_LOAD_ADDR 0x1000000
#define CONFIG_PREBOOT "usb start"
diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/configs/sun8i.h
--- u-boot-2019.04/include/configs/sun8i.h 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-mender/include/configs/sun8i.h 2020-04-17 11:05:40.304138535 +0930
/* Shell */
diff -uNr u-boot-2020.04/include/configs/sun8i.h u-boot-2020.04-mender/include/configs/sun8i.h
--- u-boot-2020.04/include/configs/sun8i.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-mender/include/configs/sun8i.h 2020-05-30 20:14:13.528252487 +0930
@@ -17,4 +17,7 @@
*/
#include <configs/sunxi-common.h>
...
...
@@ -165,10 +189,10 @@ diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/c
+#define CONFIG_BOOTCOUNT_ENV
+
#endif /* __CONFIG_H */
diff -uNr u-boot-20
19.04/include/configs/sunxi-common.h u-boot-2019
.04-mender/include/configs/sunxi-common.h
--- u-boot-20
19.04/include/configs/sunxi-common.h 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-mender/include/configs/sunxi-common.h 2020-04-17 11:05:40.305138538
+0930
@@ -1
44,15 +14
4,7 @@
diff -uNr u-boot-20
20.04/include/configs/sunxi-common.h u-boot-2020
.04-mender/include/configs/sunxi-common.h
--- u-boot-20
20.04/include/configs/sunxi-common.h 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-mender/include/configs/sunxi-common.h 2020-05-30 20:14:13.528252487
+0930
@@ -1
34,15 +13
4,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif
...
...
@@ -184,9 +208,9 @@ diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/in
#ifndef CONFIG_MACH_SUN8I_V3S
/* 64MB of malloc() pool */
diff -uNr u-boot-20
19.04/include/env_default.h u-boot-2019
.04-mender/include/env_default.h
--- u-boot-20
19.04/include/env_default.h 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-mender/include/env_default.h 2020-04-17 11:05:40.305138538
+0930
diff -uNr u-boot-20
20.04/include/env_default.h u-boot-2020
.04-mender/include/env_default.h
--- u-boot-20
20.04/include/env_default.h 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-mender/include/env_default.h 2020-05-30 20:14:13.528252487
+0930
@@ -9,6 +9,8 @@
#include <env_callback.h>
...
...
@@ -194,7 +218,7 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env
+#include <env_mender.h>
+
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
env_t environment __UBOOT_ENV_SECTION__(environment) = {
env_t e
mbedded_e
nvironment __UBOOT_ENV_SECTION__(environment) = {
ENV_CRC, /* CRC Sum */
@@ -21,6 +23,7 @@
#else
...
...
@@ -213,9 +237,9 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env
#endif
#ifdef CONFIG_RAMBOOTCOMMAND
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
diff -uNr u-boot-20
19.04/include/env_mender.h u-boot-2019
.04-mender/include/env_mender.h
--- u-boot-20
19
.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
19.04-mender/include/env_mender.h 2020-04-17 11:05:40.305138538
+0930
diff -uNr u-boot-20
20.04/include/env_mender.h u-boot-2020
.04-mender/include/env_mender.h
--- u-boot-20
20
.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
20.04-mender/include/env_mender.h 2020-05-30 20:14:13.528252487
+0930
@@ -0,0 +1,86 @@
+/*
+ Copyright 2017 Northern.tech AS
...
...
@@ -303,9 +327,9 @@ diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_
+#endif /* !MENDER_AUTO_PROBING */
+
+#endif /* HEADER_ENV_MENDER_H */
diff -uNr u-boot-20
19.04/scripts/Makefile.autoconf u-boot-2019
.04-mender/scripts/Makefile.autoconf
--- u-boot-20
19.04/scripts/Makefile.autoconf 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-mender/scripts/Makefile.autoconf 2020-04-17 11:05:40.305138538
+0930
diff -uNr u-boot-20
20.04/scripts/Makefile.autoconf u-boot-2020
.04-mender/scripts/Makefile.autoconf
--- u-boot-20
20.04/scripts/Makefile.autoconf 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-mender/scripts/Makefile.autoconf 2020-05-30 20:14:13.529252489
+0930
@@ -109,7 +109,8 @@
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \
...
...
u-boot-20
19
.04-serial-number-fix.patch
→
u-boot-20
20
.04-serial-number-fix.patch
View file @
a40381ae
diff -uNr u-boot-20
19.04/board/raspberrypi/rpi/rpi.c u-boot-2019
.04-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-20
19.04/board/raspberrypi/rpi/rpi.c 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-serial-number-fix/board/raspberrypi/rpi/rpi.c 2019-09-01 10:46:40.881020934
+0930
@@ -37
3,9 +373
,6 @@
diff -uNr u-boot-20
20.04/board/raspberrypi/rpi/rpi.c u-boot-2020
.04-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-20
20.04/board/raspberrypi/rpi/rpi.c 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-serial-number-fix/board/raspberrypi/rpi/rpi.c 2020-05-30 19:51:58.277978268
+0930
@@ -37
1,9 +371
,6 @@
int ret;
char serial_string[17] = { 0 };
...
...
@@ -11,10 +11,10 @@ diff -uNr u-boot-2019.04/board/raspberrypi/rpi/rpi.c u-boot-2019.04-serial-numbe
BCM2835_MBOX_INIT_HDR(msg);
BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL);
diff -uNr u-boot-20
19.04/board/sunxi/board.c u-boot-2019
.04-serial-number-fix/board/sunxi/board.c
--- u-boot-20
19.04/board/sunxi/board.c 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-serial-number-fix/board/sunxi/board.c 2019-09-01 10:46:40.882020936
+0930
@@ -7
77,6 +777
,7 @@
diff -uNr u-boot-20
20.04/board/sunxi/board.c u-boot-2020
.04-serial-number-fix/board/sunxi/board.c
--- u-boot-20
20.04/board/sunxi/board.c 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-serial-number-fix/board/sunxi/board.c 2020-05-30 19:51:58.277978268
+0930
@@ -7
81,6 +781
,7 @@
uint8_t mac_addr[6];
char ethaddr[16];
int i, ret;
...
...
@@ -22,7 +22,7 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-serial-number-fix/bo
ret = sunxi_get_sid(sid);
if (ret == 0 && sid[0] != 0) {
@@ -82
5,10 +826
,10 @@
@@ -82
9,10 +830
,10 @@
eth_env_set_enetaddr(ethaddr, mac_addr);
}
...
...
u-boot-20
19
.04-sunxi_env_in_mmc0.patch
→
u-boot-20
20
.04-sunxi_env_in_mmc0.patch
View file @
a40381ae
diff -uNr u-boot-20
19.04/include/configs/sunxi-common.h u-boot-2019
.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-20
19.04/include/configs/sunxi-common.h 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2019-09-01 10:50:52.325519293
+0930
@@ -1
44,13 +14
4,7 @@
diff -uNr u-boot-20
20.04/include/configs/sunxi-common.h u-boot-2020
.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-20
20.04/include/configs/sunxi-common.h 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2020-05-30 20:01:25.717364330
+0930
@@ -1
34,13 +13
4,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif
...
...
u-boot-20
19
.04-sunxi_wdt.patch
→
u-boot-20
20
.04-sunxi_wdt.patch
View file @
a40381ae
diff -uNr u-boot-20
19.04/board/sunxi/board.c u-boot-2019
.04-sunxi_wdt/board/sunxi/board.c
--- u-boot-20
19.04/board/sunxi/board.c 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-sunxi_wdt/board/sunxi/board.c 2019-09-01 10:53:00.394773118
+0930
@@ -
36,6 +36
,7 @@
diff -uNr u-boot-20
20.04/board/sunxi/board.c u-boot-2020
.04-sunxi_wdt/board/sunxi/board.c
--- u-boot-20
20.04/board/sunxi/board.c 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-sunxi_wdt/board/sunxi/board.c 2020-05-30 20:04:51.966871529
+0930
@@ -
40,6 +40
,7 @@
#include <spl.h>
#include <sy8106a.h>
#include <asm/setup.h>
...
...
@@ -9,7 +9,7 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunx
#if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
/* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */
@@ -31
2,6 +313
,20 @@
@@ -31
6,6 +317
,20 @@
return spl;
}
...
...
@@ -30,10 +30,10 @@ diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunx
int dram_init(void)
{
struct boot_file_head *spl = get_spl_header(SPL_DRAM_HEADER_VERSION);
diff -uNr u-boot-20
19.04/drivers/watchdog/Kconfig u-boot-2019
.04-sunxi_wdt/drivers/watchdog/Kconfig
--- u-boot-20
19.04/drivers/watchdog/Kconfig 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-sunxi_wdt/drivers/watchdog/Kconfig 2019-09-01 10:53:00.394773118
+0930
@@ -7
7,7 +77
,7 @@
diff -uNr u-boot-20
20.04/drivers/watchdog/Kconfig u-boot-2020
.04-sunxi_wdt/drivers/watchdog/Kconfig
--- u-boot-20
20.04/drivers/watchdog/Kconfig 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-sunxi_wdt/drivers/watchdog/Kconfig 2020-05-30 20:11:06.916793584
+0930
@@ -7
5,7 +75
,7 @@
config WDT_ASPEED
bool "Aspeed ast2400/ast2500 watchdog timer support"
...
...
@@ -42,12 +42,13 @@ diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drive
default y if ARCH_ASPEED
help
Select this to enable watchdog timer for Aspeed ast2500/ast2400 devices.
@@ -
96,11 +96,21
@@
@@ -
148,12 +148,22
@@
config WDT_ORION
bool "Orion watchdog timer support"
- depends on WDT
+ depends on WDT && ARCH_MVEBU
select CLK
help
Select this to enable Orion watchdog timer, which can be found on some
Marvell Armada chips.
...
...
@@ -62,23 +63,23 @@ diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drive
+ This provides basic infrastructure to support Sunxi watchdog
+ hardware, with a max timeout of ~16secs.
+
config WDT_
CDNS
bool "
Cadence watchdog timer support
"
depends on WDT
diff -uNr u-boot-20
19.04/drivers/watchdog/Makefile u-boot-2019
.04-sunxi_wdt/drivers/watchdog/Makefile
--- u-boot-20
19.04/drivers/watchdog/Makefile 2019-04-09 11:10:40
.000000000 +0930
+++ u-boot-20
19.04-sunxi_wdt/drivers/watchdog/Makefile 2019-09-01 10:53:00.395773120
+0930
@@ -2
3,6 +23
,7 @@
config WDT_
SANDBOX
bool "
Enable Watchdog Timer support for Sandbox
"
depends on
SANDBOX &&
WDT
diff -uNr u-boot-20
20.04/drivers/watchdog/Makefile u-boot-2020
.04-sunxi_wdt/drivers/watchdog/Makefile
--- u-boot-20
20.04/drivers/watchdog/Makefile 2020-04-14 00:32:18
.000000000 +0930
+++ u-boot-20
20.04-sunxi_wdt/drivers/watchdog/Makefile 2020-05-30 20:04:51.967871531
+0930
@@ -2
2,6 +22
,7 @@
obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o
obj-$(CONFIG_
BCM2835_WDT) += bcm2835
_wdt.o
obj-$(CONFIG_
WDT_CORTINA) += cortina
_wdt.o
obj-$(CONFIG_WDT_ORION) += orion_wdt.o
+obj-$(CONFIG_WDT_SUNXI) += sunxi_wdt.o
obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o
obj-$(CONFIG_
MPC8xx_WATCHDOG
) += mpc8xx_wdt.o
obj-$(CONFIG_
WDT_MPC8xx
) += mpc8xx_wdt.o
obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o
diff -uNr u-boot-20
19.04/drivers/watchdog/sunxi_wdt.c u-boot-2019
.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c
--- u-boot-20
19
.04/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
19.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2019-09-01 10:53:00.395773120
+0930
diff -uNr u-boot-20
20.04/drivers/watchdog/sunxi_wdt.c u-boot-2020
.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c
--- u-boot-20
20
.04/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-20
20.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2020-05-30 20:04:51.967871531
+0930
@@ -0,0 +1,274 @@
+/*
+ * sunxi Watchdog Driver
...
...
u-boot-20
19
.04.tar.bz2
→
u-boot-20
20
.04.tar.bz2
View file @
a40381ae
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment