Skip to content

GitLab

U
u-boot
Commit 9a446658 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated u-boot to 2019.04

parent abf42e93
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 64 deletions
u-boot-2018.05-mender.patch → u-boot-2019.04-mender.patch
View file @ 9a446658
diff -uNr u-boot-2018.05/env/Kconfig u-boot-2018.05-mender/env/Kconfig
--- u-boot-2018.05/env/Kconfig 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-mender/env/Kconfig 2018-10-14 17:47:13.739770707 +1030
@@ -433,10 +433,8 @@
if ARCH_SUNXI
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 2019-09-01 10:43:16.684616224 +0930
@@ -473,14 +473,8 @@
if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
config ENV_OFFSET
- hex "Environment Offset"
- depends on !ENV_IS_IN_UBI
- depends on !ENV_IS_NOWHERE
- default 0x3f8000 if ARCH_ROCKCHIP
- default 0x88000 if ARCH_SUNXI
- default 0xE0000 if ARCH_ZYNQ
- default 0x1E00000 if ARCH_ZYNQMP
- default 0 if ARC
+ 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-2018.05/include/config_mender_defines.h u-boot-2018.05-mender/include/config_mender_defines.h
--- u-boot-2018.05/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2018.05-mender/include/config_mender_defines.h 2018-10-14 17:46:35.818652610 +1030
diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/include/config_mender_defines.h
--- u-boot-2019.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-mender/include/config_mender_defines.h 2019-09-01 10:41:11.704369284 +0930
@@ -0,0 +1,17 @@
+/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1
......@@ -35,9 +39,9 @@ diff -uNr u-boot-2018.05/include/config_mender_defines.h u-boot-2018.05-mender/i
+
+/* For sanity checks. */
+#define MENDER_BOOTENV_SIZE 0x20000
diff -uNr u-boot-2018.05/include/config_mender.h u-boot-2018.05-mender/include/config_mender.h
--- u-boot-2018.05/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2018.05-mender/include/config_mender.h 2018-10-14 17:46:35.818652610 +1030
diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/config_mender.h
--- u-boot-2019.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-mender/include/config_mender.h 2019-09-01 10:41:11.704369284 +0930
@@ -0,0 +1,83 @@
+/*
+ Copyright 2017 Northern.tech AS
......@@ -122,10 +126,10 @@ diff -uNr u-boot-2018.05/include/config_mender.h u-boot-2018.05-mender/include/c
+#endif /* !MENDER_AUTO_PROBING */
+
+#endif /* HEADER_CONFIG_MENDER_H */
diff -uNr u-boot-2018.05/include/configs/rpi.h u-boot-2018.05-mender/include/configs/rpi.h
--- u-boot-2018.05/include/configs/rpi.h 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-mender/include/configs/rpi.h 2018-10-14 17:46:35.818652610 +1030
@@ -73,7 +73,9 @@
diff -uNr u-boot-2019.04/include/configs/rpi.h u-boot-2019.04-mender/include/configs/rpi.h
--- u-boot-2019.04/include/configs/rpi.h 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-mender/include/configs/rpi.h 2019-09-01 10:41:11.704369284 +0930
@@ -71,7 +71,9 @@
#define CONFIG_SYS_CBSIZE 1024
/* Environment */
......@@ -136,10 +140,10 @@ diff -uNr u-boot-2018.05/include/configs/rpi.h u-boot-2018.05-mender/include/con
#define CONFIG_SYS_LOAD_ADDR 0x1000000
#define CONFIG_PREBOOT "usb start"
diff -uNr u-boot-2018.05/include/configs/sun8i.h u-boot-2018.05-mender/include/configs/sun8i.h
--- u-boot-2018.05/include/configs/sun8i.h 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-mender/include/configs/sun8i.h 2018-10-14 17:46:35.818652610 +1030
@@ -31,4 +31,7 @@
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 2019-09-01 10:41:11.704369284 +0930
@@ -17,4 +17,7 @@
*/
#include <configs/sunxi-common.h>
......@@ -147,10 +151,10 @@ diff -uNr u-boot-2018.05/include/configs/sun8i.h u-boot-2018.05-mender/include/c
+#define CONFIG_BOOTCOUNT_ENV
+
#endif /* __CONFIG_H */
diff -uNr u-boot-2018.05/include/configs/sunxi-common.h u-boot-2018.05-mender/include/configs/sunxi-common.h
--- u-boot-2018.05/include/configs/sunxi-common.h 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-mender/include/configs/sunxi-common.h 2018-10-14 17:48:31.665013407 +1030
@@ -150,16 +150,9 @@
diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/include/configs/sunxi-common.h
--- u-boot-2019.04/include/configs/sunxi-common.h 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-mender/include/configs/sunxi-common.h 2019-09-01 10:58:01.054369013 +0930
@@ -144,15 +144,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif
......@@ -162,15 +166,13 @@ diff -uNr u-boot-2018.05/include/configs/sunxi-common.h u-boot-2018.05-mender/in
-#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
#define CONFIG_SYS_MMC_MAX_DEVICE 4
#elif defined(CONFIG_ENV_IS_NOWHERE)
-#define CONFIG_ENV_SIZE (128 << 10)
+#define CONFIG_ENV_SIZE SZ_128K
#endif
-#endif
#ifndef CONFIG_MACH_SUN8I_V3S
diff -uNr u-boot-2018.05/include/env_default.h u-boot-2018.05-mender/include/env_default.h
--- u-boot-2018.05/include/env_default.h 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-mender/include/env_default.h 2018-10-14 17:46:35.818652610 +1030
/* 64MB of malloc() pool */
diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env_default.h
--- u-boot-2019.04/include/env_default.h 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-mender/include/env_default.h 2019-09-01 10:41:11.705369286 +0930
@@ -9,6 +9,8 @@
#include <env_callback.h>
......@@ -197,9 +199,9 @@ diff -uNr u-boot-2018.05/include/env_default.h u-boot-2018.05-mender/include/env
#endif
#ifdef CONFIG_RAMBOOTCOMMAND
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
diff -uNr u-boot-2018.05/include/env_mender.h u-boot-2018.05-mender/include/env_mender.h
--- u-boot-2018.05/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2018.05-mender/include/env_mender.h 2018-10-14 17:46:35.818652610 +1030
diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_mender.h
--- u-boot-2019.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-mender/include/env_mender.h 2019-09-01 10:41:11.705369286 +0930
@@ -0,0 +1,86 @@
+/*
+ Copyright 2017 Northern.tech AS
......@@ -287,9 +289,9 @@ diff -uNr u-boot-2018.05/include/env_mender.h u-boot-2018.05-mender/include/env_
+#endif /* !MENDER_AUTO_PROBING */
+
+#endif /* HEADER_ENV_MENDER_H */
diff -uNr u-boot-2018.05/scripts/Makefile.autoconf u-boot-2018.05-mender/scripts/Makefile.autoconf
--- u-boot-2018.05/scripts/Makefile.autoconf 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-mender/scripts/Makefile.autoconf 2018-10-14 17:46:35.818652610 +1030
diff -uNr u-boot-2019.04/scripts/Makefile.autoconf u-boot-2019.04-mender/scripts/Makefile.autoconf
--- u-boot-2019.04/scripts/Makefile.autoconf 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-mender/scripts/Makefile.autoconf 2019-09-01 10:41:11.705369286 +0930
@@ -109,7 +109,8 @@
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \
......
u-boot-2018.05-serial-number-fix.patch → u-boot-2019.04-serial-number-fix.patch
View file @ 9a446658
diff -uNr u-boot-2018.05/board/raspberrypi/rpi/rpi.c u-boot-2018.05-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-2018.05/board/raspberrypi/rpi/rpi.c 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-serial-number-fix/board/raspberrypi/rpi/rpi.c 2018-06-18 00:02:17.490748265 +0930
@@ -371,9 +371,6 @@
diff -uNr u-boot-2019.04/board/raspberrypi/rpi/rpi.c u-boot-2019.04-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-2019.04/board/raspberrypi/rpi/rpi.c 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-serial-number-fix/board/raspberrypi/rpi/rpi.c 2019-09-01 10:46:40.881020934 +0930
@@ -373,9 +373,6 @@
int ret;
char serial_string[17] = { 0 };
......@@ -11,10 +11,10 @@ diff -uNr u-boot-2018.05/board/raspberrypi/rpi/rpi.c u-boot-2018.05-serial-numbe
BCM2835_MBOX_INIT_HDR(msg);
BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL);
diff -uNr u-boot-2018.05/board/sunxi/board.c u-boot-2018.05-serial-number-fix/board/sunxi/board.c
--- u-boot-2018.05/board/sunxi/board.c 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-serial-number-fix/board/sunxi/board.c 2018-06-18 00:02:17.490748265 +0930
@@ -663,6 +663,7 @@
diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-serial-number-fix/board/sunxi/board.c
--- u-boot-2019.04/board/sunxi/board.c 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-serial-number-fix/board/sunxi/board.c 2019-09-01 10:46:40.882020936 +0930
@@ -777,6 +777,7 @@
uint8_t mac_addr[6];
char ethaddr[16];
int i, ret;
......@@ -22,7 +22,7 @@ diff -uNr u-boot-2018.05/board/sunxi/board.c u-boot-2018.05-serial-number-fix/bo
ret = sunxi_get_sid(sid);
if (ret == 0 && sid[0] != 0) {
@@ -711,10 +712,10 @@
@@ -825,10 +826,10 @@
eth_env_set_enetaddr(ethaddr, mac_addr);
}
......
u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch → u-boot-2019.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
View file @ 9a446658
diff -uNr u-boot-2018.05/arch/arm/mach-sunxi/clock_sun6i.c u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c
--- u-boot-2018.05/arch/arm/mach-sunxi/clock_sun6i.c 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c 2018-06-18 00:09:14.269104776 +0930
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;
......
u-boot-2018.05-sunxi_env_in_mmc0.patch → u-boot-2019.04-sunxi_env_in_mmc0.patch
View file @ 9a446658
diff -uNr u-boot-2018.05/include/configs/sunxi-common.h u-boot-2018.05-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-2018.05/include/configs/sunxi-common.h 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2018-06-18 00:07:53.957844101 +0930
@@ -150,13 +150,7 @@
diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-2019.04/include/configs/sunxi-common.h 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2019-09-01 10:50:52.325519293 +0930
@@ -144,13 +144,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif
......@@ -13,5 +13,5 @@ diff -uNr u-boot-2018.05/include/configs/sunxi-common.h u-boot-2018.05-sunxi_env
#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
#define CONFIG_SYS_MMC_MAX_DEVICE 4
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE (128 << 10)
#endif
u-boot-2018.05-sunxi_wdt.patch → u-boot-2019.04-sunxi_wdt.patch
View file @ 9a446658
diff -uNr u-boot-2018.05/board/sunxi/board.c u-boot-2018.05-sunxi_wdt/board/sunxi/board.c
--- u-boot-2018.05/board/sunxi/board.c 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-sunxi_wdt/board/sunxi/board.c 2018-09-08 01:58:12.034023066 +0930
@@ -34,6 +34,7 @@
diff -uNr u-boot-2019.04/board/sunxi/board.c u-boot-2019.04-sunxi_wdt/board/sunxi/board.c
--- u-boot-2019.04/board/sunxi/board.c 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/board/sunxi/board.c 2019-09-01 10:53:00.394773118 +0930
@@ -36,6 +36,7 @@
#include <spl.h>
#include <sy8106a.h>
#include <asm/setup.h>
......@@ -9,8 +9,8 @@ diff -uNr u-boot-2018.05/board/sunxi/board.c u-boot-2018.05-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() */
@@ -253,6 +254,20 @@
return soft_i2c_board_init();
@@ -312,6 +313,20 @@
return spl;
}
+#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT_SUNXI)
......@@ -29,11 +29,11 @@ diff -uNr u-boot-2018.05/board/sunxi/board.c u-boot-2018.05-sunxi_wdt/board/sunx
+
int dram_init(void)
{
gd->ram_size = get_ram_size((long *)PHYS_SDRAM_0, PHYS_SDRAM_0_SIZE);
diff -uNr u-boot-2018.05/drivers/watchdog/Kconfig u-boot-2018.05-sunxi_wdt/drivers/watchdog/Kconfig
--- u-boot-2018.05/drivers/watchdog/Kconfig 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-sunxi_wdt/drivers/watchdog/Kconfig 2018-09-08 02:05:10.892277036 +0930
@@ -62,7 +62,7 @@
struct boot_file_head *spl = get_spl_header(SPL_DRAM_HEADER_VERSION);
diff -uNr u-boot-2019.04/drivers/watchdog/Kconfig u-boot-2019.04-sunxi_wdt/drivers/watchdog/Kconfig
--- u-boot-2019.04/drivers/watchdog/Kconfig 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/drivers/watchdog/Kconfig 2019-09-01 10:53:00.394773118 +0930
@@ -77,7 +77,7 @@
config WDT_ASPEED
bool "Aspeed ast2400/ast2500 watchdog timer support"
......@@ -42,7 +42,7 @@ diff -uNr u-boot-2018.05/drivers/watchdog/Kconfig u-boot-2018.05-sunxi_wdt/drive
default y if ARCH_ASPEED
help
Select this to enable watchdog timer for Aspeed ast2500/ast2400 devices.
@@ -81,11 +81,21 @@
@@ -96,11 +96,21 @@
config WDT_ORION
bool "Orion watchdog timer support"
......@@ -65,19 +65,20 @@ diff -uNr u-boot-2018.05/drivers/watchdog/Kconfig u-boot-2018.05-sunxi_wdt/drive
config WDT_CDNS
bool "Cadence watchdog timer support"
depends on WDT
diff -uNr u-boot-2018.05/drivers/watchdog/Makefile u-boot-2018.05-sunxi_wdt/drivers/watchdog/Makefile
--- u-boot-2018.05/drivers/watchdog/Makefile 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-sunxi_wdt/drivers/watchdog/Makefile 2018-09-08 02:05:44.645378082 +0930
@@ -20,5 +20,6 @@
diff -uNr u-boot-2019.04/drivers/watchdog/Makefile u-boot-2019.04-sunxi_wdt/drivers/watchdog/Makefile
--- u-boot-2019.04/drivers/watchdog/Makefile 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/drivers/watchdog/Makefile 2019-09-01 10:53:00.395773120 +0930
@@ -23,6 +23,7 @@
obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o
obj-$(CONFIG_BCM2835_WDT) += bcm2835_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
diff -uNr u-boot-2018.05/drivers/watchdog/sunxi_wdt.c u-boot-2018.05-sunxi_wdt/drivers/watchdog/sunxi_wdt.c
--- u-boot-2018.05/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2018.05-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2018-09-08 01:58:12.035023069 +0930
obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o
diff -uNr u-boot-2019.04/drivers/watchdog/sunxi_wdt.c u-boot-2019.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c
--- u-boot-2019.04/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2019.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2019-09-01 10:53:00.395773120 +0930
@@ -0,0 +1,274 @@
+/*
+ * sunxi Watchdog Driver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment