diff --git a/packages/tools/u-boot-tools/package.mk b/packages/tools/u-boot-tools/package.mk index 7ac39005f0..9ecaf429d7 100644 --- a/packages/tools/u-boot-tools/package.mk +++ b/packages/tools/u-boot-tools/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="u-boot-tools" -PKG_VERSION="2022.01" -PKG_SHA256="81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413" +PKG_VERSION="2022.04" +PKG_SHA256="68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0" PKG_LICENSE="GPL" PKG_SITE="https://www.denx.de/wiki/U-Boot" PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-${PKG_VERSION}.tar.bz2" diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 8fffbcd507..c502d4cd17 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -29,8 +29,8 @@ case "${PROJECT}" in PKG_PATCH_DIRS="rockchip" ;; *) - PKG_VERSION="2022.01" - PKG_SHA256="81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413" + PKG_VERSION="2022.04" + PKG_SHA256="68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0" PKG_URL="http://ftp.denx.de/pub/u-boot/${PKG_NAME}-${PKG_VERSION}.tar.bz2" ;; esac diff --git a/projects/Allwinner/devices/H3/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch b/projects/Allwinner/devices/H3/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch index 8814965f18..2e658a8cc5 100644 --- a/projects/Allwinner/devices/H3/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch +++ b/projects/Allwinner/devices/H3/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch @@ -33,8 +33,8 @@ diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefi index 1d40d6a18dca..4a0c16deb459 100644 --- a/arch/arm/cpu/armv7/sunxi/Makefile +++ b/arch/arm/cpu/armv7/sunxi/Makefile -@@ -11,7 +11,7 @@ obj-$(CONFIG_MACH_SUN6I) += tzpc.o - obj-$(CONFIG_MACH_SUN8I_H3) += tzpc.o +@@ -13,7 +13,7 @@ obj-$(CONFIG_MACH_SUN6I) += tzpc.o + obj-$(CONFIG_MACH_SUN8I) += sram.o ifndef CONFIG_SPL_BUILD -obj-$(CONFIG_ARMV7_PSCI) += psci.o diff --git a/projects/Allwinner/patches/u-boot/0002-binman-Prevent-entries-in-a-section-from-overlapping.patch b/projects/Allwinner/patches/u-boot/0002-binman-Prevent-entries-in-a-section-from-overlapping.patch index 195eee6d7b..b02ea40ff4 100644 --- a/projects/Allwinner/patches/u-boot/0002-binman-Prevent-entries-in-a-section-from-overlapping.patch +++ b/projects/Allwinner/patches/u-boot/0002-binman-Prevent-entries-in-a-section-from-overlapping.patch @@ -26,12 +26,12 @@ index 70222718ea93..61822eb5e44f 100644 if self.offset_unset: self.Raise('No offset set with offset-unset: should another ' 'entry provide this correct offset?') -- self.offset = tools.Align(offset, self.align) +- self.offset = tools.align(offset, self.align) + elif self.offset > offset: + offset = self.offset -+ self.offset = tools.Align(offset, self.align) ++ self.offset = tools.align(offset, self.align) needed = self.pad_before + self.contents_size + self.pad_after - needed = tools.Align(needed, self.align_size) + needed = tools.align(needed, self.align_size) size = self.size -- 2.33.0 diff --git a/projects/Allwinner/patches/u-boot/0006-mkimage-sunxi_egon-Allow-overriding-the-padding-size.patch b/projects/Allwinner/patches/u-boot/0006-mkimage-sunxi_egon-Allow-overriding-the-padding-size.patch deleted file mode 100644 index e467bee738..0000000000 --- a/projects/Allwinner/patches/u-boot/0006-mkimage-sunxi_egon-Allow-overriding-the-padding-size.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f71f348d1a96baf265e08850320a43c893ac75a4 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sat, 17 Apr 2021 14:50:12 -0500 -Subject: [PATCH 06/13] mkimage: sunxi_egon: Allow overriding the padding size - -Due to a bug in the H3 SoC, where the CPU 0 hotplug flag cannot be -written, resuming CPU 0 requires using the "Super Standby" code path in -the BROM instead of the hotplug path. This path requires jumping to an -eGON image in SRAM. - -This resume image, whose only purpose is to jump back to the secure -monitor, contains a single instruction. Padding the image to 8 KiB would -be wasteful of SRAM. Hook up the -B (block size) option so users can set -the block/padding size. - -Signed-off-by: Samuel Holland ---- - tools/sunxi_egon.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/tools/sunxi_egon.c b/tools/sunxi_egon.c -index a5299eb6a115..d1398c07fb08 100644 ---- a/tools/sunxi_egon.c -+++ b/tools/sunxi_egon.c -@@ -10,9 +10,10 @@ - - /* - * NAND requires 8K padding. SD/eMMC gets away with 512 bytes, -- * but let's use the larger padding to cover both. -+ * but let's use the larger padding by default to cover both. - */ - #define PAD_SIZE 8192 -+#define PAD_SIZE_MIN 512 - - static int egon_check_params(struct image_tool_params *params) - { -@@ -114,10 +115,12 @@ static int egon_check_image_type(uint8_t type) - static int egon_vrec_header(struct image_tool_params *params, - struct image_type_params *tparams) - { -+ int pad_size = ALIGN(params->bl_len ?: PAD_SIZE, PAD_SIZE_MIN); -+ - tparams->hdr = calloc(sizeof(struct boot_file_head), 1); - -- /* Return padding to 8K blocks. */ -- return ALIGN(params->file_size, PAD_SIZE) - params->file_size; -+ /* Return padding to complete blocks. */ -+ return ALIGN(params->file_size, pad_size) - params->file_size; - } - - U_BOOT_IMAGE_TYPE( --- -2.33.0 - diff --git a/projects/Allwinner/patches/u-boot/0013-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch b/projects/Allwinner/patches/u-boot/0013-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch deleted file mode 100644 index 1a1f4bec61..0000000000 --- a/projects/Allwinner/patches/u-boot/0013-sunxi-call-fdt_fixup_ethernet-again-to-set-macaddr-f.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Fri, 27 Oct 2017 17:25:00 +0800 -Subject: [PATCH 20/20] sunxi: call fdt_fixup_ethernet again to set macaddr for - more aliases - -Sometimes some ethernet aliases do not exist in U-Boot FDT but they -exist in the FDT used to boot the system. In this situation -setup_environment is called again in ft_board_setup to generate macaddr -environment variable for them. However now the call to -fdt_fixup_ethernet is moved before the call of ft_board_setup. - -Call fdt_fixup_ethernet again to add MAC addresses for the extra -ethernet aliases. - -Signed-off-by: Icenowy Zheng ---- - board/sunxi/board.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/board/sunxi/board.c -+++ b/board/sunxi/board.c -@@ -970,10 +970,12 @@ int ft_board_setup(void *blob, struct bd - int __maybe_unused r; - - /* -- * Call setup_environment again in case the boot fdt has -- * ethernet aliases the u-boot copy does not have. -+ * Call setup_environment and fdt_fixup_ethernet again -+ * in case the boot fdt has ethernet aliases the u-boot -+ * copy does not have. - */ - setup_environment(blob); -+ fdt_fixup_ethernet(blob); - - bluetooth_dt_fixup(blob); - diff --git a/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch b/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch index 4c5689ce24..b7ee48dfa5 100644 --- a/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch +++ b/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch @@ -12,7 +12,7 @@ diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig index e2e3a15da1..d70d7fc1cc 100644 --- a/configs/pico-imx8mq_defconfig +++ b/configs/pico-imx8mq_defconfig -@@ -57,3 +57,4 @@ CONFIG_DM_REGULATOR_GPIO=y +@@ -83,3 +83,4 @@ CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RESET=y CONFIG_MXC_UART=y CONFIG_DM_THERMAL=y @@ -21,8 +21,8 @@ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 7a5891652f..e301bc736d 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h -@@ -71,54 +71,22 @@ - #define CONFIG_PHY_ATHEROS +@@ -41,42 +41,22 @@ + #define IMX_FEC_BASE 0x30BE0000 #endif -/* Initial environment variables */ @@ -36,7 +36,7 @@ index 7a5891652f..e301bc736d 100644 - "initrd_addr=0x43800000\0" \ - "initrd_high=0xffffffffffffffff\0" \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ -- "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ +- "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ - "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ @@ -61,18 +61,6 @@ index 7a5891652f..e301bc736d 100644 - "fi; " \ - "${get_cmd} ${loadaddr} ${image}; " \ - "booti; " -- --#define CONFIG_BOOTCOMMAND \ -- "mmc dev ${mmcdev}; if mmc rescan; then " \ -- "if run loadbootscript; then " \ -- "run bootscript; " \ -- "else " \ -- "if run loadimage; then " \ -- "run mmcboot; " \ -- "else run netboot; " \ -- "fi; " \ -- "fi; " \ -- "else booti ${loadaddr} - ${fdt_addr}; fi" +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ @@ -91,7 +79,7 @@ index 7a5891652f..e301bc736d 100644 + BOOTENV /* Link Definitions */ - #define CONFIG_LOADADDR 0x40480000 + -- 2.29.2