mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
uboot-mvebu: update to v2022.07
- Release announcement: https://lore.kernel.org/u-boot/20220711134339.GV1146598@bill-the-cat/ - Changes between 2022.04 and 2022.07: https://source.denx.de/u-boot/u-boot/-/compare/v2022.04...v2022.07?from_project_id=531 Remove one upstreamed patch and add patch to fix issue with sunxi tool as it uses function from newer version libressl (3.5.0). Signed-off-by: Andre Heider <a.heider@gmail.com> Tested-by: Josef Schlehofer <pepe.schlehofer@gmail.com> [Turris Omnia] (cherry picked from commit 24bf6813bad98a8eba5430ed5e4da89d54797274) Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> [Improve commit message]
This commit is contained in:
parent
ec8b5cf0e6
commit
39ac29a68a
@ -8,10 +8,10 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/kernel.mk
|
include $(INCLUDE_DIR)/kernel.mk
|
||||||
|
|
||||||
PKG_VERSION:=2022.04
|
PKG_VERSION:=2022.07
|
||||||
PKG_RELEASE:=$(AUTORELEASE)
|
PKG_RELEASE:=$(AUTORELEASE)
|
||||||
|
|
||||||
PKG_HASH:=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
|
PKG_HASH:=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/u-boot.mk
|
include $(INCLUDE_DIR)/u-boot.mk
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
20
package/boot/uboot-mvebu/patches/100-fix-build.patch
Normal file
20
package/boot/uboot-mvebu/patches/100-fix-build.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
The build fails on a sunxi tool:
|
||||||
|
|
||||||
|
/usr/bin/ld: tools/sunxi_toc0.o: in function `toc0_set_header':
|
||||||
|
sunxi_toc0.c:(.text+0x363): undefined reference to `RSA_get0_d'
|
||||||
|
|
||||||
|
The missing function was added in libressl v3.5.0. We don't
|
||||||
|
really care, so just cut it out for now.
|
||||||
|
|
||||||
|
--- a/tools/Makefile
|
||||||
|
+++ b/tools/Makefile
|
||||||
|
@@ -96,8 +96,7 @@ AES_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(
|
||||||
|
|
||||||
|
# Cryptographic helpers and image types that depend on openssl/libcrypto
|
||||||
|
LIBCRYPTO_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := \
|
||||||
|
- lib/fdt-libcrypto.o \
|
||||||
|
- sunxi_toc0.o
|
||||||
|
+ lib/fdt-libcrypto.o
|
||||||
|
|
||||||
|
ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o
|
||||||
|
|
@ -1,31 +0,0 @@
|
|||||||
From 40a67a9403deafdac05564b7350af49a71e12373 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
|
|
||||||
Date: Fri, 29 Apr 2022 17:34:53 +0200
|
|
||||||
Subject: [PATCH] arm: mvebu: clearfog_defconfig: enable setexpr command
|
|
||||||
|
|
||||||
This command is useful in U-boot scripts and it is being used by
|
|
||||||
OpenWrt bootscript for this board [1]. Otherwise shell scripting
|
|
||||||
commands are enabled by default in cmd/Kconfig.
|
|
||||||
|
|
||||||
[1] https://github.com/openwrt/openwrt/blob/852126680e21edc71c0c66561ae5a6d7479dcc67/target/linux/mvebu/image/clearfog.bootscript#L7
|
|
||||||
|
|
||||||
[2] https://source.denx.de/u-boot/u-boot/-/blob/e95afa56753cebcd20a5114b6d121f281b789006/cmd/Kconfig#L1504
|
|
||||||
|
|
||||||
Fixes: 0299c90f396c5b2971a4bac596339f4b03661c27 ("arm: mvebu: Add
|
|
||||||
SolidRun ClearFog Armada 38x initial support")
|
|
||||||
|
|
||||||
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
|
|
||||||
---
|
|
||||||
configs/clearfog_defconfig | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/configs/clearfog_defconfig
|
|
||||||
+++ b/configs/clearfog_defconfig
|
|
||||||
@@ -35,7 +35,6 @@ CONFIG_CMD_MMC=y
|
|
||||||
CONFIG_CMD_PCI=y
|
|
||||||
CONFIG_CMD_SPI=y
|
|
||||||
CONFIG_CMD_USB=y
|
|
||||||
-# CONFIG_CMD_SETEXPR is not set
|
|
||||||
CONFIG_CMD_TFTPPUT=y
|
|
||||||
CONFIG_CMD_CACHE=y
|
|
||||||
CONFIG_CMD_TIME=y
|
|
Loading…
Reference in New Issue
Block a user