From a52f4544f74f927043440f080dfb2e01b117c55a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 11 Oct 2024 12:02:03 +0000 Subject: [PATCH 1/2] u-boot (Allwinner): rebase patches for 2024.10 ref: - https://github.com/u-boot/u-boot/commit/a79fc7a79cc9d4f7a46b19a4891484ac1e9ef599 --- .../0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch | 3 +-- .../0012-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/Allwinner/devices/H2-plus/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch b/projects/Allwinner/devices/H2-plus/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch index 8814965f18..372c8a3e82 100644 --- a/projects/Allwinner/devices/H2-plus/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch +++ b/projects/Allwinner/devices/H2-plus/patches/u-boot/0001-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch @@ -47,14 +47,13 @@ new file mode 100644 index 000000000000..b3849b366e31 --- /dev/null +++ b/arch/arm/cpu/armv7/sunxi/psci-scpi.c -@@ -0,0 +1,451 @@ +@@ -0,0 +1,450 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2016 Chen-Yu Tsai + * Copyright (C) 2018-2021 Samuel Holland + */ + -+#include +#include +#include +#include diff --git a/projects/Allwinner/devices/H3/patches/u-boot/0012-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch b/projects/Allwinner/devices/H3/patches/u-boot/0012-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch index 6709170083..49e49b7172 100644 --- a/projects/Allwinner/devices/H3/patches/u-boot/0012-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch +++ b/projects/Allwinner/devices/H3/patches/u-boot/0012-DO-NOT-MERGE-sunxi-psci-Delegate-PSCI-to-SCPI.patch @@ -50,14 +50,13 @@ new file mode 100644 index 0000000000..fea51eb456 --- /dev/null +++ b/arch/arm/cpu/armv7/sunxi/psci-scpi.c -@@ -0,0 +1,463 @@ +@@ -0,0 +1,462 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2016 Chen-Yu Tsai + * Copyright (C) 2018-2021 Samuel Holland + */ + -+#include +#include +#include +#include From dd6cf0c90b853718282549a671cea75ca21ee6dc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 7 Oct 2024 23:59:21 +0000 Subject: [PATCH 2/2] u-boot: update to 2024.10 do not build mkeficapsule tool on NXP or Qualcomm (requires gnutls) - https://patchwork.ozlabs.org/project/uboot/patch/20240531225110.2622239-2-j-humphreys@ti.com/ --- packages/tools/u-boot/package.mk | 4 ++-- projects/NXP/devices/iMX6/bootloader/config | 1 + projects/NXP/devices/iMX8/bootloader/config | 1 + projects/Qualcomm/devices/Dragonboard/bootloader/config | 1 + projects/Samsung/bootloader/config | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 projects/NXP/devices/iMX6/bootloader/config create mode 100644 projects/NXP/devices/iMX8/bootloader/config create mode 100644 projects/Qualcomm/devices/Dragonboard/bootloader/config diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index fd8e396232..ef1a7382ce 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="u-boot" -PKG_VERSION="2024.07" -PKG_SHA256="f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f" +PKG_VERSION="2024.10" +PKG_SHA256="b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0" PKG_ARCH="arm aarch64" PKG_LICENSE="GPL" PKG_SITE="https://www.denx.de/wiki/U-Boot" diff --git a/projects/NXP/devices/iMX6/bootloader/config b/projects/NXP/devices/iMX6/bootloader/config new file mode 100644 index 0000000000..61e79e377c --- /dev/null +++ b/projects/NXP/devices/iMX6/bootloader/config @@ -0,0 +1 @@ +# CONFIG_EFI_LOADER is not set diff --git a/projects/NXP/devices/iMX8/bootloader/config b/projects/NXP/devices/iMX8/bootloader/config new file mode 100644 index 0000000000..61e79e377c --- /dev/null +++ b/projects/NXP/devices/iMX8/bootloader/config @@ -0,0 +1 @@ +# CONFIG_EFI_LOADER is not set diff --git a/projects/Qualcomm/devices/Dragonboard/bootloader/config b/projects/Qualcomm/devices/Dragonboard/bootloader/config new file mode 100644 index 0000000000..61e79e377c --- /dev/null +++ b/projects/Qualcomm/devices/Dragonboard/bootloader/config @@ -0,0 +1 @@ +# CONFIG_EFI_LOADER is not set diff --git a/projects/Samsung/bootloader/config b/projects/Samsung/bootloader/config index af519a0df9..2ce896dee7 100644 --- a/projects/Samsung/bootloader/config +++ b/projects/Samsung/bootloader/config @@ -1,3 +1,4 @@ +# CONFIG_EFI_LOADER is not set CONFIG_LZ4=y CONFIG_LZO=y CONFIG_LZMA=y