Skip to content

GitLab

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

Fixed mender patch for FriendlyElec CM3588 Plus

parent 4bc334c9
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 18 deletions
Makefile
View file @ 575cc485
......@@ -1130,6 +1130,7 @@ export FW_ENV_FRIENDLYELECCM3588PLUS
friendlyelec-cm3588-plus-mender: friendlyelec-cm3588-plus-boot-cmd-mender friendlyelec-cm3588-plus-fw_env.config-mender
tar xf u-boot-2021.04.tar.gz
patch -Np1 -d u-boot-2021.04 < u-boot-2021.04-cm3588-nas.patch
patch -Np1 -d u-boot-2021.04 < u-boot-2021.04-mender.patch
tar xf rk3588-firmware.tar.xz -C u-boot-2021.04
$(MAKE) -C u-boot-2021.04 cm3588-nas-rk3588_defconfig
@echo "# CONFIG_ENV_IS_NOWHERE is not set" >> u-boot-2021.04/.config
......
u-boot-2021.04-mender.patch
View file @ 575cc485
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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig 2025-02-20 23:10:05.119580783 +0000
+++ u-boot-2021.04-mender/configs/odroid-xu3_defconfig 2026-11-02 04:50:28.316295323 +0000
@@ -4,8 +4,7 @@
CONFIG_SYS_TEXT_BASE=0x43E00000
CONFIG_ARCH_EXYNOS5=y
......@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/configs/odroid-xu3_defconfig u-boot-2021.04-mender/conf
CONFIG_DISTRO_DEFAULTS=y
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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/configs/p212_defconfig 2025-02-20 23:10:05.123580760 +0000
+++ u-boot-2021.04-mender/configs/p212_defconfig 2026-11-02 04:50:28.316295323 +0000
@@ -2,7 +2,7 @@
CONFIG_ARCH_MESON=y
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
CONFIG_DEBUG_UART_BASE=0xc81004c0
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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/configs/rpi_3_defconfig 2025-02-20 23:10:05.123580760 +0000
+++ u-boot-2021.04-mender/configs/rpi_3_defconfig 2026-11-02 04:50:28.316295323 +0000
@@ -5,7 +5,7 @@
CONFIG_TARGET_RPI_3=y
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
CONFIG_OF_BOARD_SETUP=y
diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
--- u-boot-2021.04/env/Kconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/env/Kconfig 2025-02-20 23:10:05.127580737 +0000
+++ u-boot-2021.04-mender/env/Kconfig 2026-11-02 04:51:26.629902720 +0000
@@ -514,26 +514,14 @@
environment location.
......@@ -56,7 +56,7 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
- default 0x260000 if ARCH_OMAP2PLUS
- default 0x1080000 if MICROBLAZE && ENV_IS_IN_SPI_FLASH
+ hex "Environment Offset will be set by mender patch"
+ depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X && !ARCH_SOCFPGA && !ARCH_EXYNOS && !ARCH_ZYNQMP
+ depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X && !ARCH_SOCFPGA && !ARCH_EXYNOS && !ARCH_ZYNQMP && !ARCH_ROCKCHIP
help
Offset from the start of the device (or partition)
......@@ -65,7 +65,7 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
- depends on (ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \
- ENV_IS_IN_SPI_FLASH) && SYS_REDUNDAND_ENVIRONMENT
+ hex "Redundant Environment Offset will be set by mender patch"
+ depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X && !ARCH_SOCFPGA && !ARCH_EXYNOS && !ARCH_ZYNQMP
+ depends on !ARCH_SUNXI && !ARCH_MESON && !ARCH_BCM283X && !ARCH_SOCFPGA && !ARCH_EXYNOS && !ARCH_ZYNQMP && !ARCH_ROCKCHIP
help
Offset from the start of the device (or partition) of the redundant
environment location.
......@@ -97,7 +97,7 @@ diff -uNr u-boot-2021.04/env/Kconfig u-boot-2021.04-mender/env/Kconfig
help
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 00:00:00.000000000 +0000
+++ u-boot-2021.04-mender/include/config_mender_defines.h 2025-02-20 23:10:05.131580713 +0000
+++ u-boot-2021.04-mender/include/config_mender_defines.h 2026-11-02 04:50:28.316295323 +0000
@@ -0,0 +1,17 @@
+/* Shell variables */
+#define MENDER_BOOT_PART_NUMBER 1
......@@ -118,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
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 00:00:00.000000000 +0000
+++ u-boot-2021.04-mender/include/config_mender.h 2025-02-20 23:10:05.131580713 +0000
+++ u-boot-2021.04-mender/include/config_mender.h 2026-11-02 04:50:28.316295323 +0000
@@ -0,0 +1,83 @@
+/*
+ Copyright 2017 Northern.tech AS
......@@ -205,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 */
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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/meson64.h 2025-02-20 23:10:05.135580690 +0000
+++ u-boot-2021.04-mender/include/configs/meson64.h 2026-11-02 04:50:28.316295323 +0000
@@ -31,6 +31,8 @@
#define CONFIG_CPU_ARMV8
......@@ -217,7 +217,7 @@ diff -uNr u-boot-2021.04/include/configs/meson64.h u-boot-2021.04-mender/include
#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
--- 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 2025-02-20 23:10:05.135580690 +0000
+++ u-boot-2021.04-mender/include/configs/odroid_xu3.h 2026-11-02 04:50:28.316295323 +0000
@@ -10,6 +10,9 @@
#include <configs/exynos5420-common.h>
#include <configs/exynos5-common.h>
......@@ -230,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
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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/rpi.h 2025-02-20 23:10:05.139580667 +0000
+++ u-boot-2021.04-mender/include/configs/rpi.h 2026-11-02 04:50:28.316295323 +0000
@@ -95,6 +95,8 @@
#define CONFIG_SYS_CBSIZE 1024
......@@ -242,7 +242,7 @@ diff -uNr u-boot-2021.04/include/configs/rpi.h u-boot-2021.04-mender/include/con
/* 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 2025-02-20 23:10:05.139580667 +0000
+++ u-boot-2021.04-mender/include/configs/sun50i.h 2026-11-02 04:50:28.316295323 +0000
@@ -23,4 +23,7 @@
*/
#include <configs/sunxi-common.h>
......@@ -253,7 +253,7 @@ diff -uNr u-boot-2021.04/include/configs/sun50i.h u-boot-2021.04-mender/include/
#endif /* __CONFIG_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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/sun8i.h 2025-02-20 23:10:05.143580644 +0000
+++ u-boot-2021.04-mender/include/configs/sun8i.h 2026-11-02 04:50:28.320295432 +0000
@@ -17,4 +17,7 @@
*/
#include <configs/sunxi-common.h>
......@@ -264,7 +264,7 @@ diff -uNr u-boot-2021.04/include/configs/sun8i.h u-boot-2021.04-mender/include/c
#endif /* __CONFIG_H */
diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-mender/include/configs/xilinx_zynqmp.h
--- u-boot-2021.04/include/configs/xilinx_zynqmp.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/configs/xilinx_zynqmp.h 2025-02-20 23:11:20.107140623 +0000
+++ u-boot-2021.04-mender/include/configs/xilinx_zynqmp.h 2026-11-02 04:50:28.320295432 +0000
@@ -255,4 +255,7 @@
# error "Disable CONFIG_SPL_SYS_MALLOC_SIMPLE. Full malloc needs to be used"
#endif
......@@ -275,7 +275,7 @@ diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-mender/i
#endif /* __XILINX_ZYNQMP_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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/include/env_default.h 2025-02-20 23:10:05.143580644 +0000
+++ u-boot-2021.04-mender/include/env_default.h 2026-11-02 04:50:28.320295432 +0000
@@ -10,6 +10,8 @@
#include <env_callback.h>
#include <linux/stringify.h>
......@@ -304,7 +304,7 @@ diff -uNr u-boot-2021.04/include/env_default.h u-boot-2021.04-mender/include/env
"ramboot=" CONFIG_RAMBOOTCOMMAND "\0"
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 00:00:00.000000000 +0000
+++ u-boot-2021.04-mender/include/env_mender.h 2025-02-20 23:10:05.147580620 +0000
+++ u-boot-2021.04-mender/include/env_mender.h 2026-11-02 04:50:28.320295432 +0000
@@ -0,0 +1,86 @@
+/*
+ Copyright 2017 Northern.tech AS
......@@ -394,7 +394,7 @@ diff -uNr u-boot-2021.04/include/env_mender.h u-boot-2021.04-mender/include/env_
+#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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/scripts/config_whitelist.txt 2025-02-20 23:10:05.151580597 +0000
+++ u-boot-2021.04-mender/scripts/config_whitelist.txt 2026-11-02 04:50:28.320295432 +0000
@@ -2911,6 +2911,8 @@
CONFIG_SYS_MMC_BASE
CONFIG_SYS_MMC_CD_PIN
......@@ -406,7 +406,7 @@ diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-mender/scri
CONFIG_SYS_MMC_U_BOOT_DST
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-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-mender/scripts/Makefile.autoconf 2025-02-20 23:10:05.155580574 +0000
+++ u-boot-2021.04-mender/scripts/Makefile.autoconf 2026-11-02 04:50:28.320295432 +0000
@@ -108,7 +108,8 @@
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).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