From a52f4544f74f927043440f080dfb2e01b117c55a Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 11 Oct 2024 12:02:03 +0000
Subject: [PATCH] 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 <wens@csie.org>
 + * Copyright (C) 2018-2021 Samuel Holland <samuel@sholland.org>
 + */
 +
-+#include <common.h>
 +#include <asm/arch/cpu.h>
 +#include <asm/arch/cpucfg.h>
 +#include <asm/armv7.h>
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 <wens@csie.org>
 + * Copyright (C) 2018-2021 Samuel Holland <samuel@sholland.org>
 + */
 +
-+#include <common.h>
 +#include <asm/arch/cpu.h>
 +#include <asm/armv7.h>
 +#include <asm/gic.h>