Skip to content

GitLab

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

Fixed mender patch

parent bf2a6032
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 28 deletions
u-boot-2021.04-mender.patch
View file @ 36b22f40
diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/configs/odroid-xu3_defconfig diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/configs/odroid-xu3_defconfig
--- u-boot-2021.04/configs/odroid-xu3_defconfig 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/configs/odroid-xu3_defconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig 2024-02-29 23:20:52.035511680 +1030 +++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig 2024-05-30 15:48:59.983798479 +0000
@@ -4,8 +4,7 @@ @@ -4,8 +4,7 @@
CONFIG_SYS_TEXT_BASE=0x43E00000 CONFIG_SYS_TEXT_BASE=0x43E00000
CONFIG_ARCH_EXYNOS5=y CONFIG_ARCH_EXYNOS5=y
...@@ -12,8 +12,8 @@ diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/conf ...@@ -12,8 +12,8 @@ diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/conf
CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3" CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p212_defconfig diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p212_defconfig
--- u-boot-2021.04/configs/p212_defconfig 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/configs/p212_defconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/configs/p212_defconfig 2024-02-29 23:20:52.037511637 +1030 +++ u-boot-2021.04-mender/configs/p212_defconfig 2024-05-30 15:48:59.983798479 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
CONFIG_ARCH_MESON=y CONFIG_ARCH_MESON=y
CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_SYS_TEXT_BASE=0x01000000
...@@ -24,8 +24,8 @@ diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p2 ...@@ -24,8 +24,8 @@ diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p2
CONFIG_MESON_GXL=y CONFIG_MESON_GXL=y
CONFIG_DEBUG_UART_BASE=0xc81004c0 CONFIG_DEBUG_UART_BASE=0xc81004c0
diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/rpi_3_defconfig diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/rpi_3_defconfig
--- u-boot-2021.04/configs/rpi_3_defconfig 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/configs/rpi_3_defconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/configs/rpi_3_defconfig 2024-02-29 23:20:52.039511595 +1030 +++ u-boot-2021.04-mender/configs/rpi_3_defconfig 2024-05-30 15:48:59.983798479 +0000
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
CONFIG_TARGET_RPI_3=y CONFIG_TARGET_RPI_3=y
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
...@@ -36,8 +36,8 @@ diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/r ...@@ -36,8 +36,8 @@ diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/r
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
--- u-boot-2021.04/env/Kconfig 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/env/Kconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/env/Kconfig 2024-02-29 23:20:52.042511530 +1030 +++ u-boot-2021.04-mender/env/Kconfig 2024-05-30 15:48:59.987798557 +0000
@@ -514,26 +514,14 @@ @@ -514,26 +514,14 @@
environment location. environment location.
...@@ -96,8 +96,8 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig ...@@ -96,8 +96,8 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
bool "Create default environment from file" bool "Create default environment from file"
help help
diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/include/config_mender_defines.h diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/include/config_mender_defines.h
--- u-boot-2021.04/include/config_mender_defines.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2021.04/include/config_mender_defines.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-mender/include/config_mender_defines.h 2024-02-29 23:20:52.044511487 +1030 +++ u-boot-2021.04-mender/include/config_mender_defines.h 2024-05-30 15:48:59.987798557 +0000
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+/* Shell variables */ +/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1 +#define MENDER_BOOT_PART_NUMBER 1
...@@ -117,8 +117,8 @@ diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/i ...@@ -117,8 +117,8 @@ diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/i
+/* For sanity checks. */ +/* For sanity checks. */
+#define MENDER_BOOTENV_SIZE 0x20000 +#define MENDER_BOOTENV_SIZE 0x20000
diff -uNr u-boot-2021.04/include/config_mender.h u-boot-2021.04-mender/include/config_mender.h diff -uNr u-boot-2021.04/include/config_mender.h u-boot-2021.04-mender/include/config_mender.h
--- u-boot-2021.04/include/config_mender.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2021.04/include/config_mender.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-mender/include/config_mender.h 2024-02-29 23:20:52.045511466 +1030 +++ u-boot-2021.04-mender/include/config_mender.h 2024-05-30 15:48:59.987798557 +0000
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -204,8 +204,8 @@ diff -uNr u-boot-2021.04/include/config_mender.h u-boot-2021.04-mender/include/c ...@@ -204,8 +204,8 @@ diff -uNr u-boot-2021.04/include/config_mender.h u-boot-2021.04-mender/include/c
+ +
+#endif /* HEADER_CONFIG_MENDER_H */ +#endif /* HEADER_CONFIG_MENDER_H */
diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include/configs/meson64.h diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include/configs/meson64.h
--- u-boot-2021.04/include/configs/meson64.h 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/include/configs/meson64.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/meson64.h 2024-02-29 23:20:52.046511444 +1030 +++ u-boot-2021.04-mender/include/configs/meson64.h 2024-05-30 15:48:59.991798635 +0000
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
#define CONFIG_CPU_ARMV8 #define CONFIG_CPU_ARMV8
...@@ -216,8 +216,8 @@ diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include ...@@ -216,8 +216,8 @@ diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include
#define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_MALLOC_LEN (32 << 20)
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
diff -uNr u-boot-2021.04/include/configs/odroid_xu3.h u-boot-2021.04-mender/include/configs/odroid_xu3.h diff -uNr u-boot-2021.04/include/configs/odroid_xu3.h u-boot-2021.04-mender/include/configs/odroid_xu3.h
--- u-boot-2021.04/include/configs/odroid_xu3.h 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/include/configs/odroid_xu3.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/odroid_xu3.h 2024-02-29 23:20:52.047511423 +1030 +++ u-boot-2021.04-mender/include/configs/odroid_xu3.h 2024-05-30 15:48:59.991798635 +0000
@@ -10,6 +10,9 @@ @@ -10,6 +10,9 @@
#include <configs/exynos5420-common.h> #include <configs/exynos5420-common.h>
#include <configs/exynos5-common.h> #include <configs/exynos5-common.h>
...@@ -229,8 +229,8 @@ diff -uNr u-boot-2021.04/include/configs/odroid_xu3.h u-boot-2021.04-mender/incl ...@@ -229,8 +229,8 @@ diff -uNr u-boot-2021.04/include/configs/odroid_xu3.h u-boot-2021.04-mender/incl
#define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_SDRAM_BASE 0x40000000
diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/configs/rpi.h diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/configs/rpi.h
--- u-boot-2021.04/include/configs/rpi.h 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/include/configs/rpi.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/rpi.h 2024-02-29 23:20:52.048511401 +1030 +++ u-boot-2021.04-mender/include/configs/rpi.h 2024-05-30 15:48:59.991798635 +0000
@@ -95,6 +95,8 @@ @@ -95,6 +95,8 @@
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
...@@ -240,9 +240,20 @@ diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/con ...@@ -240,9 +240,20 @@ diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/con
#define CONFIG_SYS_LOAD_ADDR 0x1000000 #define CONFIG_SYS_LOAD_ADDR 0x1000000
/* Shell */ /* Shell */
diff -uNr u-boot-2021.04/include/configs/sun50i.h u-boot-2021.04-mender/include/configs/sun50i.h
--- u-boot-2021.04/include/configs/sun50i.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/sun50i.h 2024-05-30 15:46:47.521222390 +0000
@@ -23,4 +23,7 @@
*/
#include <configs/sunxi-common.h>
+#define CONFIG_BOOTCOUNT_LIMIT
+#define CONFIG_BOOTCOUNT_ENV
+
#endif /* __CONFIG_H */
diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/configs/sun8i.h diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/configs/sun8i.h
--- u-boot-2021.04/include/configs/sun8i.h 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/include/configs/sun8i.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/sun8i.h 2024-02-29 23:20:52.049511380 +1030 +++ u-boot-2021.04-mender/include/configs/sun8i.h 2024-05-30 15:48:59.995798712 +0000
@@ -17,4 +17,7 @@ @@ -17,4 +17,7 @@
*/ */
#include <configs/sunxi-common.h> #include <configs/sunxi-common.h>
...@@ -252,8 +263,8 @@ diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/c ...@@ -252,8 +263,8 @@ diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/c
+ +
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env_default.h diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env_default.h
--- u-boot-2021.04/include/env_default.h 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/include/env_default.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/env_default.h 2024-02-29 23:20:52.051511337 +1030 +++ u-boot-2021.04-mender/include/env_default.h 2024-05-30 15:48:59.995798712 +0000
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
#include <env_callback.h> #include <env_callback.h>
#include <linux/stringify.h> #include <linux/stringify.h>
...@@ -281,8 +292,8 @@ diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env ...@@ -281,8 +292,8 @@ diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env
#ifdef CONFIG_RAMBOOTCOMMAND #ifdef CONFIG_RAMBOOTCOMMAND
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0" "ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_mender.h diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_mender.h
--- u-boot-2021.04/include/env_mender.h 1970-01-01 09:30:00.000000000 +0930 --- u-boot-2021.04/include/env_mender.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-mender/include/env_mender.h 2024-02-29 23:20:52.052511315 +1030 +++ u-boot-2021.04-mender/include/env_mender.h 2024-05-30 15:49:00.003798868 +0000
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -371,8 +382,8 @@ diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_ ...@@ -371,8 +382,8 @@ diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_
+ +
+#endif /* HEADER_ENV_MENDER_H */ +#endif /* HEADER_ENV_MENDER_H */
diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-mender/scripts/config_whitelist.txt diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-mender/scripts/config_whitelist.txt
--- u-boot-2021.04/scripts/config_whitelist.txt 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/scripts/config_whitelist.txt 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/scripts/config_whitelist.txt 2024-02-29 23:22:12.573782635 +1030 +++ u-boot-2021.04-mender/scripts/config_whitelist.txt 2024-05-30 15:49:00.003798868 +0000
@@ -2911,6 +2911,8 @@ @@ -2911,6 +2911,8 @@
CONFIG_SYS_MMC_BASE CONFIG_SYS_MMC_BASE
CONFIG_SYS_MMC_CD_PIN CONFIG_SYS_MMC_CD_PIN
...@@ -383,8 +394,8 @@ diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-mender/scri ...@@ -383,8 +394,8 @@ diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-mender/scri
CONFIG_SYS_MMC_MAX_DEVICE CONFIG_SYS_MMC_MAX_DEVICE
CONFIG_SYS_MMC_U_BOOT_DST CONFIG_SYS_MMC_U_BOOT_DST
diff -uNr u-boot-2021.04/scripts/Makefile.autoconf u-boot-2021.04-mender/scripts/Makefile.autoconf diff -uNr u-boot-2021.04/scripts/Makefile.autoconf u-boot-2021.04-mender/scripts/Makefile.autoconf
--- u-boot-2021.04/scripts/Makefile.autoconf 2021-04-06 00:33:29.000000000 +0930 --- u-boot-2021.04/scripts/Makefile.autoconf 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/scripts/Makefile.autoconf 2024-02-29 23:20:52.052511315 +1030 +++ u-boot-2021.04-mender/scripts/Makefile.autoconf 2024-05-30 15:49:00.007798946 +0000
@@ -108,7 +108,8 @@ @@ -108,7 +108,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