From 2f291239fed28d9df66d83c0a05a743b11041ef9 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Tue, 7 May 2024 11:39:00 +0200 Subject: [PATCH 1/2] conf/machine: add support for MangoPi MQ-R T113-S3 Signed-off-by: Leo Soares Signed-off-by: Marek Belisko --- conf/machine/mangopi-mq-t-t113.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 conf/machine/mangopi-mq-t-t113.conf diff --git a/conf/machine/mangopi-mq-t-t113.conf b/conf/machine/mangopi-mq-t-t113.conf new file mode 100644 index 0000000..006618f --- /dev/null +++ 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" From 9edbede7bcc30645a6de86ba6100e8b79cbcfe5f Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Tue, 7 May 2024 11:39:23 +0200 Subject: [PATCH 2/2] u-boot: Fix console for mangopi-mq-r-tt13 board Signed-off-by: Marek Belisko --- ...mangopi-mq-r-t113-Fix-serial-console.patch | 30 +++++++++++++++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 5 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 recipes-bsp/u-boot/files/0004-mangopi-mq-r-t113-Fix-serial-console.patch diff --git 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 new file mode 100644 index 0000000..a9d334b --- /dev/null +++ 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 +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 +--- + 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 + diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 6aad880..63f01d6 100644 --- 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"