Skip to content

GitLab

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

Added Mender support for Meson64

parent 73bafd8d
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 9 deletions
u-boot-2019.04-mender.patch
View file @ d8074b6e
diff -uNr u-boot-2019.04/env/Kconfig u-boot-2019.04-mender/env/Kconfig 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/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 +++ u-boot-2019.04-mender/env/Kconfig 2020-04-17 11:05:40.302138528 +0930
@@ -473,14 +473,8 @@ @@ -473,14 +473,8 @@
if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
...@@ -20,7 +20,7 @@ diff -uNr u-boot-2019.04/env/Kconfig u-boot-2019.04-mender/env/Kconfig ...@@ -20,7 +20,7 @@ diff -uNr u-boot-2019.04/env/Kconfig u-boot-2019.04-mender/env/Kconfig
diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/include/config_mender_defines.h 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/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 +++ u-boot-2019.04-mender/include/config_mender_defines.h 2020-04-17 11:05:40.304138535 +0930
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+/* Shell variables */ +/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1 +#define MENDER_BOOT_PART_NUMBER 1
...@@ -41,7 +41,7 @@ diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/i ...@@ -41,7 +41,7 @@ diff -uNr u-boot-2019.04/include/config_mender_defines.h u-boot-2019.04-mender/i
+#define MENDER_BOOTENV_SIZE 0x20000 +#define MENDER_BOOTENV_SIZE 0x20000
diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/config_mender.h 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/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 +++ u-boot-2019.04-mender/include/config_mender.h 2020-04-17 11:05:40.304138535 +0930
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -126,9 +126,23 @@ diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/c ...@@ -126,9 +126,23 @@ diff -uNr u-boot-2019.04/include/config_mender.h u-boot-2019.04-mender/include/c
+#endif /* !MENDER_AUTO_PROBING */ +#endif /* !MENDER_AUTO_PROBING */
+ +
+#endif /* HEADER_CONFIG_MENDER_H */ +#endif /* HEADER_CONFIG_MENDER_H */
diff -uNr u-boot-2019.04/include/configs/meson64.h u-boot-2019.04-mender/include/configs/meson64.h
--- u-boot-2019.04/include/configs/meson64.h 2019-04-09 11:10:40.000000000 +0930
+++ u-boot-2019.04-mender/include/configs/meson64.h 2020-04-17 11:04:59.329998736 +0930
@@ -38,7 +38,9 @@
#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-2019.04/include/configs/rpi.h u-boot-2019.04-mender/include/configs/rpi.h 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/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 +++ u-boot-2019.04-mender/include/configs/rpi.h 2020-04-17 11:05:40.304138535 +0930
@@ -71,7 +71,9 @@ @@ -71,7 +71,9 @@
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
...@@ -142,7 +156,7 @@ diff -uNr u-boot-2019.04/include/configs/rpi.h u-boot-2019.04-mender/include/con ...@@ -142,7 +156,7 @@ diff -uNr u-boot-2019.04/include/configs/rpi.h u-boot-2019.04-mender/include/con
diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/configs/sun8i.h 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/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 +++ u-boot-2019.04-mender/include/configs/sun8i.h 2020-04-17 11:05:40.304138535 +0930
@@ -17,4 +17,7 @@ @@ -17,4 +17,7 @@
*/ */
#include <configs/sunxi-common.h> #include <configs/sunxi-common.h>
...@@ -153,7 +167,7 @@ diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/c ...@@ -153,7 +167,7 @@ diff -uNr u-boot-2019.04/include/configs/sun8i.h u-boot-2019.04-mender/include/c
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/include/configs/sunxi-common.h 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/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 +++ u-boot-2019.04-mender/include/configs/sunxi-common.h 2020-04-17 11:05:40.305138538 +0930
@@ -144,15 +144,7 @@ @@ -144,15 +144,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000 #define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif #endif
...@@ -172,7 +186,7 @@ diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/in ...@@ -172,7 +186,7 @@ diff -uNr u-boot-2019.04/include/configs/sunxi-common.h u-boot-2019.04-mender/in
/* 64MB of malloc() pool */ /* 64MB of malloc() pool */
diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env_default.h 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/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 +++ u-boot-2019.04-mender/include/env_default.h 2020-04-17 11:05:40.305138538 +0930
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
#include <env_callback.h> #include <env_callback.h>
...@@ -201,7 +215,7 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env ...@@ -201,7 +215,7 @@ diff -uNr u-boot-2019.04/include/env_default.h u-boot-2019.04-mender/include/env
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0" "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_mender.h 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/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 +++ u-boot-2019.04-mender/include/env_mender.h 2020-04-17 11:05:40.305138538 +0930
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -291,7 +305,7 @@ diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_ ...@@ -291,7 +305,7 @@ diff -uNr u-boot-2019.04/include/env_mender.h u-boot-2019.04-mender/include/env_
+#endif /* HEADER_ENV_MENDER_H */ +#endif /* HEADER_ENV_MENDER_H */
diff -uNr u-boot-2019.04/scripts/Makefile.autoconf u-boot-2019.04-mender/scripts/Makefile.autoconf 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/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 +++ u-boot-2019.04-mender/scripts/Makefile.autoconf 2020-04-17 11:05:40.305138538 +0930
@@ -109,7 +109,8 @@ @@ -109,7 +109,8 @@
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \ echo \#include \<asm/config.h\>; \
......
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