JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Allwinner: Bump u-boot to v2023.07-rc4

Browse Source
This commit is contained in:
Gunjan Gupta
2023-06-25 03:13:05 +05:30
committed by Igor
parent 5715b12d2f
commit 748eba0031
4 changed files with 43 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
patch/u-boot/u-boot-sunxi-crust/h3-scp.patch
View File

@@ -1,37 +1,7 @@
From 07b6f327566f198ac5a138abab600c9601e6caec Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 10:40:45 -0500
Subject: [PATCH 01/10] Kconfig: Remove an impossible condition
ARCH_SUNXI selects BINMAN, so the condition "!BINMAN && ARCH_SUNXI"
is impossible to satisfy.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Kconfig b/Kconfig
index b8f65589f4..4206d0de62 100644
--- a/Kconfig
+++ b/Kconfig
@@ -432,7 +432,7 @@ config BUILD_TARGET
default "u-boot-with-spl.kwb" if ARMADA_32BIT && SPL
default "u-boot-elf.srec" if RCAR_GEN3
default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
- ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
+ RISCV || ARCH_ZYNQMP)
default "u-boot.kwb" if (ARCH_KIRKWOOD || ARMADA_32BIT) && !SPL
default "u-boot-with-spl.bin" if MPC85xx && !E500MC && !E5500 && !E6500 && SPL
default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
--
2.34.1
From b22eb354c12d309d16f0b26baa106df9af740f77 Mon Sep 17 00:00:00 2001
From 566bc30291896e38b62dcf4677a7f99502e88021 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 17 Apr 2021 13:33:54 -0500
Subject: [PATCH 02/10] sunxi: binman: Enable SPL FIT loading for 32-bit SoCs
Subject: [PATCH 1/9] sunxi: binman: Enable SPL FIT loading for 32-bit SoCs
Now that Crust (SCP firmware) has support for H3, we need a FIT image to
load it. H3 also needs to load a SoC-specific eGon blob to support CPU 0
@@ -66,15 +36,15 @@ Series-to: sjg
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
arch/arm/Kconfig | 1 +
arch/arm/dts/sunxi-u-boot.dtsi | 46 ++++++++++++++++++++++------------
arch/arm/dts/sunxi-u-boot.dtsi | 44 ++++++++++++++++++++++------------
common/spl/Kconfig | 7 +++---
3 files changed, 35 insertions(+), 19 deletions(-)
3 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1a41215ebf..472bee4213 100644
index da8efdea71..309df7b05d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1139,6 +1139,7 @@ config ARCH_SUNXI
@@ -1169,6 +1169,7 @@ config ARCH_SUNXI
imply SPL_GPIO
imply SPL_LIBCOMMON_SUPPORT
imply SPL_LIBGENERIC_SUPPORT
@@ -83,7 +53,7 @@ index 1a41215ebf..472bee4213 100644
imply SPL_POWER
imply SPL_SERIAL
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index e959eb2a40..b4e5827ed4 100644
index af419c7e59..1353d6e668 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -1,13 +1,19 @@
@@ -113,7 +83,7 @@ index e959eb2a40..b4e5827ed4 100644
#endif
/ {
@@ -32,30 +38,33 @@
@@ -37,30 +43,33 @@
filename = "spl/sunxi-spl.bin";
};
@@ -152,7 +122,7 @@ index e959eb2a40..b4e5827ed4 100644
compression = "none";
load = <BL31_ADDR>;
entry = <BL31_ADDR>;
@@ -65,6 +74,7 @@
@@ -70,6 +79,7 @@
missing-msg = "atf-bl31-sunxi";
};
};
@@ -160,7 +130,7 @@ index e959eb2a40..b4e5827ed4 100644
#ifdef SCP_ADDR
scp {
@@ -93,19 +103,23 @@
@@ -98,12 +108,16 @@
@config-SEQ {
description = "NAME";
@@ -180,16 +150,8 @@ index e959eb2a40..b4e5827ed4 100644
fdt = "fdt-SEQ";
};
};
};
#else
u-boot-img {
- offset = <CONFIG_SPL_PAD_TO>;
+ offset = <32768>;
};
#endif
};
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 3c2af453ab..1d2ee3f0d0 100644
index 2c042ad306..4e52529e69 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -76,7 +76,9 @@ config SPL_SIZE_LIMIT_PROVIDE_STACK
@@ -225,10 +187,10 @@ index 3c2af453ab..1d2ee3f0d0 100644
2.34.1
From 41b0c27f31bebfdbfc76780030ce7a93d4e20c40 Mon Sep 17 00:00:00 2001
From 501729188de546502d939c3cedee7ec1ecb04a7b Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 22:00:22 -0500
Subject: [PATCH 03/10] sunxi: psci: Avoid hanging when CPU 0 is hot-unplugged
Subject: [PATCH 2/9] sunxi: psci: Avoid hanging when CPU 0 is hot-unplugged
Do not try to send an SGI from CPU 0 to itself. Since FIQs are masked
when entering monitor mode, this will hang. Plus, CPU 0 cannot fully
@@ -282,10 +244,10 @@ index e1d3638b5c..738ea8f281 100644
2.34.1
From da90512f5aba81b0fe84ab6316ad202d8e6de815 Mon Sep 17 00:00:00 2001
From e9e05a2a43d1641d2d864a06d38f190ee8538211 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 17:12:57 -0500
Subject: [PATCH 04/10] sunxi: psci: Add support for H3 CPU 0 hotplug
Subject: [PATCH 3/9] sunxi: psci: Add support for H3 CPU 0 hotplug
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
@@ -311,10 +273,10 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
4 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index af1408222d..4e69adbe97 100644
index 8b030f31be..6810784142 100644
--- a/Makefile
+++ b/Makefile
@@ -1011,6 +1011,23 @@ ifeq ($(CONFIG_ARCH_ROCKCHIP)_$(CONFIG_SPL_FRAMEWORK),y_)
@@ -1014,6 +1014,23 @@ ifeq ($(CONFIG_ARCH_ROCKCHIP)_$(CONFIG_SPL_FRAMEWORK),y_)
INPUTS-y += u-boot.img
endif
@@ -411,7 +373,7 @@ index 738ea8f281..e6bfd193e4 100644
setbits_le32(&cpucfg->dbg_ctrl1, BIT(cpu));
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index b4e5827ed4..ac96eae9cc 100644
index 1353d6e668..5d45157598 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -6,7 +6,11 @@
@@ -427,7 +389,7 @@ index b4e5827ed4..ac96eae9cc 100644
#define BL31_ADDR 0x00044000
#define SCP_ADDR 0x00050000
#elif defined(CONFIG_MACH_SUN50I_H6)
@@ -76,6 +80,20 @@
@@ -81,6 +85,20 @@
};
#endif
@@ -448,7 +410,7 @@ index b4e5827ed4..ac96eae9cc 100644
#ifdef SCP_ADDR
scp {
description = "SCP firmware";
@@ -109,6 +127,9 @@
@@ -114,6 +132,9 @@
firmware = "uboot";
#endif
loadables =
@@ -477,10 +439,10 @@ index 608a055892..98e68e068b 100644
2.34.1
From 69a0fb1929ad5ee47e4dc84c05e9085a4e489356 Mon Sep 17 00:00:00 2001
From 1ebddf814b3f2efeeeabf473c34c366a734688f5 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 14:58:27 -0500
Subject: [PATCH 05/10] remoteproc: Add a driver for the Allwinner AR100
Subject: [PATCH 4/9] remoteproc: Add a driver for the Allwinner AR100
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
@@ -643,10 +605,10 @@ index 0000000000..c94f6c752b
2.34.1
From 0bce0723224ead36a2f7dea2471abd473ac92450 Mon Sep 17 00:00:00 2001
From 53bf73ab3356bc4c05cf4570661cf52e5a0ddc8e Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 15:04:16 -0500
Subject: [PATCH 06/10] arm: dts: sunxi: h3: Add nodes for AR100 remoteproc
Subject: [PATCH 5/9] arm: dts: sunxi: h3: Add nodes for AR100 remoteproc
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
@@ -689,10 +651,10 @@ index eac2349a23..b88dcd4272 100644
2.34.1
From 685af7c43558a7c25d3aeb0d750729c5753674a5 Mon Sep 17 00:00:00 2001
From 681163212274988bb6d826232da09289c6c2b0ea Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 17 Apr 2021 13:33:54 -0500
Subject: [PATCH 07/10] sunxi: Enable support for SCP firmware on H3
Subject: [PATCH 6/9] sunxi: Enable support for SCP firmware on H3
Now that issues with the BROM have been sorted out, we can implement
PSCI system suspend on H3 by delegating to SCP firmware. Let's start by
@@ -707,7 +669,7 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
3 files changed, 12 insertions(+)
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index ac96eae9cc..964556ec62 100644
index 5d45157598..36b55c8b80 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -9,6 +9,7 @@
@@ -719,7 +681,7 @@ index ac96eae9cc..964556ec62 100644
#elif defined(CONFIG_MACH_SUN50I) || defined(CONFIG_MACH_SUN50I_H5)
#define BL31_ADDR 0x00044000
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 3079ac0002..1e488a1952 100644
index ca9c1cd9e2..289a9d93cb 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -19,6 +19,7 @@
@@ -730,7 +692,7 @@ index 3079ac0002..1e488a1952 100644
#include <axp_pmic.h>
#include <generic-phy.h>
#include <phy-sun4i-usb.h>
@@ -884,6 +885,13 @@ int board_late_init(void)
@@ -881,6 +882,13 @@ int board_late_init(void)
usb_ether_init();
#endif
@@ -762,10 +724,10 @@ index 98e68e068b..506ce35707 100644
2.34.1
From e67ab86b597fbc5388e86152fbc2c8de85797157 Mon Sep 17 00:00:00 2001
From 56b6ac0956fe69cb30d42042d8e20c4fdca4b906 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 22:43:26 -0500
Subject: [PATCH 08/10] arm: psci: Add definitions for PSCI v1.1
Subject: [PATCH 7/9] arm: psci: Add definitions for PSCI v1.1
Add the new option, function IDs, and prototypes for PSCI v1.1
implementations. In the process, fix some issues with the existing
@@ -782,7 +744,7 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index f1e4e26b8f..c2d0491a37 100644
index e33e53636a..7d58d1837b 100644
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -80,6 +80,9 @@ choice
@@ -866,10 +828,10 @@ index 903b335704..ea9d1c8355 100644
2.34.1
From 9e64a793231211717fcaf6e63fa600f98e5ae0cc Mon Sep 17 00:00:00 2001
From d40b63cac6dcffa2f3b199cca3775138edccbbeb Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 9 Oct 2021 23:01:05 -0500
Subject: [PATCH 09/10] sunxi: psci: Delegate PSCI to SCPI
Subject: [PATCH 8/9] sunxi: psci: Delegate PSCI to SCPI
This adds a new PSCI implementation which communicates with SCP firmware
running on the AR100 using the SCPI protocol. This allows it to support
@@ -885,7 +847,7 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
create mode 100644 arch/arm/cpu/armv7/sunxi/psci-scpi.c
diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index c2d0491a37..64d822a9ae 100644
index 7d58d1837b..cbcae209dc 100644
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -75,6 +75,7 @@ config ARMV7_PSCI
@@ -1374,10 +1336,10 @@ index 0000000000..cf85292a8f
2.34.1
From 7abb8ce85969ddc24e5fc82e1042461d1acbb651 Mon Sep 17 00:00:00 2001
From adc8ea72a2d4c0600339a7afed8b1f98f3c07844 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Wed, 8 Jun 2022 07:55:54 -0500
Subject: [PATCH 10/10] sunxi: Enable SCP/SCPI on A33 as well
Subject: [PATCH 9/9] sunxi: Enable SCP/SCPI on A33 as well
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
@@ -1389,7 +1351,7 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/armv7/Kconfig b/arch/arm/cpu/armv7/Kconfig
index 64d822a9ae..ff745a8e73 100644
index cbcae209dc..6a515ed6d5 100644
--- a/arch/arm/cpu/armv7/Kconfig
+++ b/arch/arm/cpu/armv7/Kconfig
@@ -75,7 +75,7 @@ config ARMV7_PSCI
@@ -1431,7 +1393,7 @@ index cf85292a8f..717c37c124 100644
#define SCPI_RX_CHANNEL 1
diff --git a/arch/arm/dts/sun8i-a23-a33.dtsi b/arch/arm/dts/sun8i-a23-a33.dtsi
index 06809c3a1f..c3d5a0d070 100644
index 84c6d9379a..826bcddcdf 100644
--- a/arch/arm/dts/sun8i-a23-a33.dtsi
+++ b/arch/arm/dts/sun8i-a23-a33.dtsi
@@ -138,6 +138,14 @@
@@ -1462,7 +1424,7 @@ index 06809c3a1f..c3d5a0d070 100644
};
};
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 964556ec62..6f5c103148 100644
index 36b55c8b80..a152b1f787 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -6,11 +6,11 @@