diff --git a/projects/Allwinner/patches/u-boot/0011-DO-NOT-MERGE-sunxi-Enable-remoteproc-on-H3.patch b/projects/Allwinner/patches/u-boot/0011-DO-NOT-MERGE-sunxi-Enable-remoteproc-on-H3.patch new file mode 100644 index 0000000000..c18d776f3a --- /dev/null +++ b/projects/Allwinner/patches/u-boot/0011-DO-NOT-MERGE-sunxi-Enable-remoteproc-on-H3.patch @@ -0,0 +1,25 @@ +From 3fe205fc0e4c81cddbd3b7adacf29e0819f3672f Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Tue, 12 Oct 2021 20:45:10 +0200 +Subject: [PATCH] [DO NOT MERGE] sunxi: Enable remoteproc on H3 + +Signed-off-by: Jernej Skrabec +--- + arch/arm/mach-sunxi/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig +index 1d4a4fdd0c59..4414b847b7e4 100644 +--- a/arch/arm/mach-sunxi/Kconfig ++++ b/arch/arm/mach-sunxi/Kconfig +@@ -295,6 +295,7 @@ config MACH_SUN8I_H3 + select CPU_V7_HAS_VIRT + select ARCH_SUPPORT_PSCI + select MACH_SUNXI_H3_H5 ++ select REMOTEPROC_SUN6I_AR100 + select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT + + config MACH_SUN8I_R40 +-- +2.33.0 + diff --git a/projects/Allwinner/patches/u-boot/0011-DO-NOT-MERGE-sunxi-Enable-remoteproc-on-some-H3-boar.patch b/projects/Allwinner/patches/u-boot/0011-DO-NOT-MERGE-sunxi-Enable-remoteproc-on-some-H3-boar.patch deleted file mode 100644 index 6fe8b56ffa..0000000000 --- a/projects/Allwinner/patches/u-boot/0011-DO-NOT-MERGE-sunxi-Enable-remoteproc-on-some-H3-boar.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 23a37da3c54dcda1b988d2f87b15d8a1154c1c4e Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Mon, 11 Oct 2021 03:20:28 -0500 -Subject: [PATCH 11/13] [DO NOT MERGE] sunxi: Enable remoteproc on some H3 - boards - -Signed-off-by: Samuel Holland ---- - configs/orangepi_one_defconfig | 1 + - configs/orangepi_plus2e_defconfig | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig -index 1064b4a39d..7af932870a 100644 ---- a/configs/orangepi_one_defconfig -+++ b/configs/orangepi_one_defconfig -@@ -6,5 +6,6 @@ CONFIG_MACH_SUN8I_H3=y - CONFIG_DRAM_CLK=672 - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set - CONFIG_SUN8I_EMAC=y -+CONFIG_REMOTEPROC_SUN6I_AR100=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y -diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig -index 5e2cbc48ea..03fba682f7 100644 ---- a/configs/orangepi_plus2e_defconfig -+++ b/configs/orangepi_plus2e_defconfig -@@ -11,5 +11,6 @@ CONFIG_SPL_SYS_I2C_LEGACY=y - CONFIG_SYS_I2C_MVTWSI=y - CONFIG_SUN8I_EMAC=y - CONFIG_SY8106A_POWER=y -+CONFIG_REMOTEPROC_SUN6I_AR100=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y --- -2.34.1 -