diff --git a/projects/Allwinner/patches/u-boot/0001-OrangePi-PC2-Update-defaults.patch b/projects/Allwinner/patches/u-boot/0001-OrangePi-PC2-Update-defaults.patch deleted file mode 100644 index 383c9769f4..0000000000 --- a/projects/Allwinner/patches/u-boot/0001-OrangePi-PC2-Update-defaults.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sun, 8 Mar 2020 08:08:03 +0100 -Subject: [PATCH] OrangePi PC2: Update defaults - ---- - configs/orangepi_pc2_defconfig | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/configs/orangepi_pc2_defconfig -+++ b/configs/orangepi_pc2_defconfig -@@ -5,11 +5,13 @@ CONFIG_SPL=y - CONFIG_MACH_SUN50I_H5=y - CONFIG_DRAM_CLK=672 - CONFIG_DRAM_ZQ=3881977 --# CONFIG_DRAM_ODT_EN is not set - CONFIG_MACPWR="PD6" - CONFIG_SPL_SPI_SUNXI=y -+CONFIG_SPL_I2C_SUPPORT=y - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set - CONFIG_SUN8I_EMAC=y -+CONFIG_SY8106A_POWER=y -+CONFIG_SY8106A_VOUT1_VOLT=1100 - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_MUSB_GADGET=y diff --git a/projects/Allwinner/patches/u-boot/0002-sunxi-A23-A33-H3-Move-sun8i-secure-monitor-to-SRAM-A.patch b/projects/Allwinner/patches/u-boot/0002-sunxi-A23-A33-H3-Move-sun8i-secure-monitor-to-SRAM-A.patch deleted file mode 100644 index a534094482..0000000000 --- a/projects/Allwinner/patches/u-boot/0002-sunxi-A23-A33-H3-Move-sun8i-secure-monitor-to-SRAM-A.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sun, 18 Apr 2021 22:21:41 -0500 -Subject: [PATCH] sunxi: A23/A33/H3: Move sun8i secure monitor to SRAM A2 - -So far for the H3, A23, and A33 SoCs, we use DRAM to hold the secure -monitor code (providing PSCI runtime services). And while those SoCs do -not have the secure SRAM B like older SoCs, there is enough (secure) -SRAM A2 to put the monitor code and data in there instead. - -Follow the design of 64-bit SoCs and use the first part for the monitor, -and the last 16 KiB for the SCP firmware. With this change, the monitor -no longer needs to reserve a region in DRAM. - -Signed-off-by: Samuel Holland -Reviewed-by: Andre Przywara -[Andre: amend commit message, fix R40 and V3s build] -Signed-off-by: Andre Przywara ---- - arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 11 +++++++++++ - include/configs/sun8i.h | 10 ++++++++++ - 2 files changed, 21 insertions(+) - ---- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h -+++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h -@@ -11,7 +11,18 @@ - #define SUNXI_SRAM_A1_BASE 0x00000000 - #define SUNXI_SRAM_A1_SIZE (16 * 1024) /* 16 kiB */ - -+#if defined(CONFIG_SUNXI_GEN_SUN6I) && \ -+ !defined(CONFIG_MACH_SUN8I_R40) && \ -+ !defined(CONFIG_MACH_SUN8I_V3S) -+#define SUNXI_SRAM_A2_BASE 0x00040000 -+#ifdef CONFIG_MACH_SUN8I_H3 -+#define SUNXI_SRAM_A2_SIZE (48 * 1024) /* 16+32 kiB */ -+#else -+#define SUNXI_SRAM_A2_SIZE (80 * 1024) /* 16+64 kiB */ -+#endif -+#else - #define SUNXI_SRAM_A2_BASE 0x00004000 /* 16 kiB */ -+#endif - #define SUNXI_SRAM_A3_BASE 0x00008000 /* 13 kiB */ - #define SUNXI_SRAM_A4_BASE 0x0000b400 /* 3 kiB */ - #define SUNXI_SRAM_D_BASE 0x00010000 /* 4 kiB */ ---- a/include/configs/sun8i.h -+++ b/include/configs/sun8i.h -@@ -12,6 +12,16 @@ - * A23 specific configuration - */ - -+#ifdef SUNXI_SRAM_A2_SIZE -+/* -+ * If the SoC has enough SRAM A2, use that for the secure monitor. -+ * Skip the first 16 KiB of SRAM A2, which is not usable, as only certain bytes -+ * are writable. Reserve the last 17 KiB for the resume shim and SCP firmware. -+ */ -+#define CONFIG_ARMV7_SECURE_BASE (SUNXI_SRAM_A2_BASE + 16 * 1024) -+#define CONFIG_ARMV7_SECURE_MAX_SIZE (SUNXI_SRAM_A2_SIZE - 33 * 1024) -+#endif -+ - /* - * Include common sunxi configuration where most the settings are - */