conf/machine/mangopi-mq-t-t113.conf

@@ -1,10 +0,0 @@
-#@TYPE: Machine
-#@NAME: MangoPi MQ-R T113-S3
-#@DESCRIPTION: Machine configuration for the MangoPi MQ-R, based on the Allwinner T113-S3 CPU
-
-require conf/machine/include/sun8i.inc
-
-KERNEL_DEVICETREE = "sun8i-t113s-mangopi-mq-r-t113.dtb"
-KERNEL_IMAGETYPE = "zImage"
-
-UBOOT_MACHINE = "mangopi_mq_r_defconfig"

recipes-bsp/u-boot/files/0004-mangopi-mq-r-t113-Fix-serial-console.patch

@@ -1,30 +0,0 @@
-From bf813915bf480154c707e0be14016cef94adbd95 Mon Sep 17 00:00:00 2001
-From: Marek Belisko <marek.belisko@gmail.com>
-Date: Tue, 7 May 2024 11:27:08 +0200
-Subject: [PATCH] mangopi-mq-r-t113: Fix serial console
-
-Serial console is on uart3 not on uart0.
-
-Upstream-Status: Inappropriate (for this board only)
-
-Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
----
- include/configs/sunxi-common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index b8ca77d031..4e4808d2c1 100644
---- a/include/configs/sunxi-common.h
-+++ b/include/configs/sunxi-common.h
-@@ -324,7 +324,7 @@
- 	MEM_LAYOUT_ENV_EXTRA_SETTINGS \
- 	DFU_ALT_INFO_RAM \
- 	"fdtfile=" FDTFILE "\0" \
--	"console=ttyS0,115200\0" \
-+	"console=ttyS3,115200\0" \
- 	"uuid_gpt_esp=" UUID_GPT_ESP "\0" \
- 	"uuid_gpt_system=" UUID_GPT_SYSTEM "\0" \
- 	"partitions=" PARTS_DEFAULT "\0" \
--- 
-2.25.1
-

recipes-bsp/u-boot/u-boot_%.bbappend

@@ -12,12 +12,11 @@ DEFAULT_PREFERENCE:sun8i = "1"
 DEFAULT_PREFERENCE:sun50i = "1"
 
 SRC_URI:append:sunxi = " \
-	file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
+        file://0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch \
 	file://0002-Added-nanopi-r1-board-support.patch \
 	file://0003-sunxi-H6-Enable-Ethernet-on-Orange-Pi-One-Plus.patch \
-  file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \
+        file://0004-OrangePi-3-LTS-support.patch \
-  file://0004-OrangePi-3-LTS-support.patch \
+        file://boot.cmd \
-  file://boot.cmd \
 "
 
 UBOOT_ENV_SUFFIX:sunxi = "scr"