Skip to content

GitLab

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

Fixed mender patch

parent dbde5f31
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 13 deletions
u-boot-2021.04-mender.patch
View file @ 45856ae8
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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig 2023-04-13 10:55:29.170445098 +0930 +++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig 2024-02-29 23:20:52.035511680 +1030
@@ -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
...@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/conf ...@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/conf
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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/configs/p212_defconfig 2023-04-13 10:56:39.852653453 +0930 +++ u-boot-2021.04-mender/configs/p212_defconfig 2024-02-29 23:20:52.037511637 +1030
@@ -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
...@@ -25,7 +25,7 @@ diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p2 ...@@ -25,7 +25,7 @@ diff -uNr u-boot-2021.04/configs/p212_defconfig u-boot-2021.04-mender/configs/p2
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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/configs/rpi_3_defconfig 2023-04-13 10:56:05.526552267 +0930 +++ u-boot-2021.04-mender/configs/rpi_3_defconfig 2024-02-29 23:20:52.039511595 +1030
@@ -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
...@@ -37,7 +37,7 @@ diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/r ...@@ -37,7 +37,7 @@ diff -uNr u-boot-2021.04/configs/rpi_3_defconfig u-boot-2021.04-mender/configs/r
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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/env/Kconfig 2023-04-13 10:52:53.188985292 +0930 +++ u-boot-2021.04-mender/env/Kconfig 2024-02-29 23:20:52.042511530 +1030
@@ -514,26 +514,14 @@ @@ -514,26 +514,14 @@
environment location. environment location.
...@@ -69,9 +69,35 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig ...@@ -69,9 +69,35 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
help help
Offset from the start of the device (or partition) of the redundant Offset from the start of the device (or partition) of the redundant
environment location. environment location.
@@ -591,25 +579,6 @@
Relocate the early env_addr pointer so we know it is not inside
the binary. Some systems need this and for the rest, it doesn't hurt.
-config SYS_MMC_ENV_DEV
- int "mmc device number"
- depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || SYS_LS_PPA_FW_IN_MMC || \
- CMD_MVEBU_BUBT || FMAN_ENET || QE
- default 0
- help
- MMC device number on the platform where the environment is stored.
-
-config SYS_MMC_ENV_PART
- int "mmc partition number"
- depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT
- default 0
- help
- MMC hardware partition device number on the platform where the
- environment is stored. Note that this is not related to any software
- defined partition table but instead if we are in the user area, which is
- partition 0 or the first boot partition, which is 1 or some other defined
- partition.
-
config USE_DEFAULT_ENV_FILE
bool "Create default environment from file"
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 09:30:00.000000000 +0930
+++ u-boot-2021.04-mender/include/config_mender_defines.h 2023-04-13 10:49:28.861382983 +0930 +++ u-boot-2021.04-mender/include/config_mender_defines.h 2024-02-29 23:20:52.044511487 +1030
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+/* Shell variables */ +/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1 +#define MENDER_BOOT_PART_NUMBER 1
...@@ -92,7 +118,7 @@ diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/i ...@@ -92,7 +118,7 @@ diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-mender/i
+#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 09:30:00.000000000 +0930
+++ u-boot-2021.04-mender/include/config_mender.h 2023-04-13 10:49:28.861382983 +0930 +++ u-boot-2021.04-mender/include/config_mender.h 2024-02-29 23:20:52.045511466 +1030
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -179,7 +205,7 @@ diff -uNr u-boot-2021.04/include/config_mender.h u-boot-2021.04-mender/include/c ...@@ -179,7 +205,7 @@ 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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/include/configs/meson64.h 2023-04-13 10:49:28.861382983 +0930 +++ u-boot-2021.04-mender/include/configs/meson64.h 2024-02-29 23:20:52.046511444 +1030
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
#define CONFIG_CPU_ARMV8 #define CONFIG_CPU_ARMV8
...@@ -191,7 +217,7 @@ diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include ...@@ -191,7 +217,7 @@ diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include
#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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/include/configs/odroid_xu3.h 2023-04-13 10:49:28.861382983 +0930 +++ u-boot-2021.04-mender/include/configs/odroid_xu3.h 2024-02-29 23:20:52.047511423 +1030
@@ -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>
...@@ -204,7 +230,7 @@ diff -uNr u-boot-2021.04/include/configs/odroid_xu3.h u-boot-2021.04-mender/incl ...@@ -204,7 +230,7 @@ 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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/include/configs/rpi.h 2023-04-13 10:49:28.862382986 +0930 +++ u-boot-2021.04-mender/include/configs/rpi.h 2024-02-29 23:20:52.048511401 +1030
@@ -95,6 +95,8 @@ @@ -95,6 +95,8 @@
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
...@@ -216,7 +242,7 @@ diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/con ...@@ -216,7 +242,7 @@ diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/con
/* Shell */ /* Shell */
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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/include/configs/sun8i.h 2023-04-13 10:49:28.862382986 +0930 +++ u-boot-2021.04-mender/include/configs/sun8i.h 2024-02-29 23:20:52.049511380 +1030
@@ -17,4 +17,7 @@ @@ -17,4 +17,7 @@
*/ */
#include <configs/sunxi-common.h> #include <configs/sunxi-common.h>
...@@ -227,7 +253,7 @@ diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/c ...@@ -227,7 +253,7 @@ 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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/include/env_default.h 2023-04-13 10:49:28.862382986 +0930 +++ u-boot-2021.04-mender/include/env_default.h 2024-02-29 23:20:52.051511337 +1030
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
#include <env_callback.h> #include <env_callback.h>
#include <linux/stringify.h> #include <linux/stringify.h>
...@@ -256,7 +282,7 @@ diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env ...@@ -256,7 +282,7 @@ diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env
"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 09:30:00.000000000 +0930
+++ u-boot-2021.04-mender/include/env_mender.h 2023-04-13 10:49:28.862382986 +0930 +++ u-boot-2021.04-mender/include/env_mender.h 2024-02-29 23:20:52.052511315 +1030
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ Copyright 2017 Northern.tech AS + Copyright 2017 Northern.tech AS
...@@ -344,9 +370,21 @@ diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_ ...@@ -344,9 +370,21 @@ diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_
+#endif /* !MENDER_AUTO_PROBING */ +#endif /* !MENDER_AUTO_PROBING */
+ +
+#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
--- u-boot-2021.04/scripts/config_whitelist.txt 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/scripts/config_whitelist.txt 2024-02-29 23:22:12.573782635 +1030
@@ -2911,6 +2911,8 @@
CONFIG_SYS_MMC_BASE
CONFIG_SYS_MMC_CD_PIN
CONFIG_SYS_MMC_CLK_OD
+CONFIG_SYS_MMC_ENV_DEV
+CONFIG_SYS_MMC_ENV_PART
CONFIG_SYS_MMC_MAX_BLK_COUNT
CONFIG_SYS_MMC_MAX_DEVICE
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-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-mender/scripts/Makefile.autoconf 2023-04-13 10:49:28.863382989 +0930 +++ u-boot-2021.04-mender/scripts/Makefile.autoconf 2024-02-29 23:20:52.052511315 +1030
@@ -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