u-boot: Fix console for mangopi-mq-r-tt13 board

Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
conf/machine: add support for MangoPi MQ-R T113-S3
2025-07-29 20:20:32 +02:00 · 2024-05-07 11:39:54 +02:00 · 2024-05-07 11:39:50 +02:00 · 2024-04-25 08:52:15 +02:00 · 2024-04-24 14:16:22 +02:00 · 2024-04-24 14:15:15 +02:00
6 changed files with 53 additions and 4 deletions
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -14,4 +14,4 @@ LAYERVERSION_sunxi = "1"

 LAYERDEPENDS_sunxi = "core meta-python meta-arm"

-LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield"
+LAYERSERIES_COMPAT_sunxi = "honister kirkstone langdale mickledore nanbield scarthgap"
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@ -14,7 +14,7 @@ XSERVER = "xserver-xorg \
           xf86-input-keyboard"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_VERSION_linux-mainline ?= "6.5.%"
+PREFERRED_VERSION_linux-mainline ?= "6.6.%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"

--- a/conf/machine/mangopi-mq-t-t113.conf
+++ b/conf/machine/mangopi-mq-t-t113.conf
@ -0,0 +1,10 @@
+#@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"
--- a/recipes-bsp/u-boot/files/0004-mangopi-mq-r-t113-Fix-serial-console.patch
+++ b/recipes-bsp/u-boot/files/0004-mangopi-mq-r-t113-Fix-serial-console.patch
@ -0,0 +1,30 @@
+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
+
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@ -12,10 +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://boot.cmd \
+	file://0004-mangopi-mq-r-t113-Fix-serial-console.patch \
+	file://boot.cmd \
 "

 UBOOT_ENV_SUFFIX:sunxi = "scr"
--- a/recipes-kernel/linux/linux-mainline_6.6.28.bb
+++ b/recipes-kernel/linux/linux-mainline_6.6.28.bb
@ -0,0 +1,8 @@
+require linux-mainline.inc
+
+DESCRIPTION = "Mainline Longterm Linux kernel"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
+
+SRC_URI[sha256sum] = "818716ed13e7dba6aaeae24e3073993e260812ed128d10272e94b922ee6d3394"
+
Author	SHA1	Message	Date
Marek Belisko	9edbede7bc	u-boot: Fix console for mangopi-mq-r-tt13 board Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-05-07 11:39:54 +02:00
Marek Belisko	2f291239fe	conf/machine: add support for MangoPi MQ-R T113-S3 Signed-off-by: Leo Soares <leojrfs@gmail.com> Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-05-07 11:39:50 +02:00
Marek Belisko	c475a1851a	linux-mainline: Added LINUX_VERSION variable Fixes: File "/home/retpolanne/Dev/orange-pi-one-plus-image/poky/scripts/lib/devtool/standard.py", line 839, in modify if (os.path.exists(srcdir) and os.listdir(srcdir)) and (kernelVersion in staging_kerVer and staging_kbranch == kbranch): ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ TypeError: 'in ' requires string as left operand, not NoneType While running devtool modify virtual/kernel. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-04-25 08:52:15 +02:00
Marek Belisko	7cd5e692b7	conf: Added scarthgap compat Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-04-24 14:16:22 +02:00
Marek Belisko	089c34a7bc	linux-mainline: Bump kernel to 6.6 Signed-off-by: Marek Belisko <marek.belisko@gmail.com>	2024-04-24 14:15:15 +02:00