From: Chukun Pan Date: Thu, 16 Apr 2026 10:06:08 +0000 (+0800) Subject: uboot-sunxi: bump to 2026.04 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23360%2Fhead;p=thirdparty%2Fopenwrt.git uboot-sunxi: bump to 2026.04 This version supports boards with 1.5GB or 3GB of RAM. Signed-off-by: Chukun Pan Link: https://github.com/openwrt/openwrt/pull/23360 Signed-off-by: Jonas Jelonek --- diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index f27c5628a5d..d352ac7ea9a 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2025.10 -PKG_HASH:=b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a +PKG_VERSION:=2026.04 +PKG_HASH:=ac7c04b8b7004923b00a4e5d6699c5df4d21233bac9fda690d8cfbc209fff2fd PKG_MAINTAINER:=Zoltan HERPAI diff --git a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch index 2774355ac14..7cda88ba567 100644 --- a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch +++ b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch @@ -17,7 +17,7 @@ Cc: Simon Glass --- a/tools/fit_image.c +++ b/tools/fit_image.c -@@ -881,9 +881,14 @@ static int fit_handle_file(struct image_ +@@ -1029,9 +1029,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { diff --git a/package/boot/uboot-sunxi/patches/400-net-add-ICPlus-PHY-driver.patch b/package/boot/uboot-sunxi/patches/400-net-add-ICPlus-PHY-driver.patch index c180921cd6a..c889a795ea1 100644 --- a/package/boot/uboot-sunxi/patches/400-net-add-ICPlus-PHY-driver.patch +++ b/package/boot/uboot-sunxi/patches/400-net-add-ICPlus-PHY-driver.patch @@ -17,7 +17,7 @@ Signed-off-by: Yegor Yefremov --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -173,6 +173,9 @@ config PHY_DAVICOM +@@ -174,6 +174,9 @@ config PHY_DAVICOM config PHY_ET1011C bool "LSI TruePHY ET1011C support" diff --git a/package/boot/uboot-sunxi/patches/401-sunxi-add-uart0_pins-on-Port-E-PE2-PE3-on-D1s-T113.patch b/package/boot/uboot-sunxi/patches/401-sunxi-add-uart0_pins-on-Port-E-PE2-PE3-on-D1s-T113.patch index 7ca5fa30c2d..a9b13f303ad 100644 --- a/package/boot/uboot-sunxi/patches/401-sunxi-add-uart0_pins-on-Port-E-PE2-PE3-on-D1s-T113.patch +++ b/package/boot/uboot-sunxi/patches/401-sunxi-add-uart0_pins-on-Port-E-PE2-PE3-on-D1s-T113.patch @@ -8,9 +8,9 @@ Signed-off-by: Zoltan HERPAI arch/riscv/dts/sunxi-d1s-t113.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) ---- a/arch/riscv/dts/sunxi-d1s-t113.dtsi -+++ b/arch/riscv/dts/sunxi-d1s-t113.dtsi -@@ -143,6 +143,12 @@ +--- a/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi ++++ b/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi +@@ -191,6 +191,12 @@ pins = "PB6", "PB7"; function = "uart3"; }; diff --git a/package/boot/uboot-sunxi/patches/402-sunxi-add-support-for-MangoPI-MQDual-T113-variant.patch b/package/boot/uboot-sunxi/patches/402-sunxi-add-support-for-MangoPI-MQDual-T113-variant.patch index 3a9901ad6a1..3843a80d7bd 100644 --- a/package/boot/uboot-sunxi/patches/402-sunxi-add-support-for-MangoPI-MQDual-T113-variant.patch +++ b/package/boot/uboot-sunxi/patches/402-sunxi-add-support-for-MangoPI-MQDual-T113-variant.patch @@ -12,20 +12,8 @@ Signed-off-by: Zoltan HERPAI create mode 100644 arch/arm/dts/sun8i-t113s-mangopi-mqdual-t113.dts create mode 100644 configs/mangopi_mqdual_t113_defconfig ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -651,7 +651,8 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \ - sun8i-t3-cqa3t-bv3.dtb \ - sun8i-v40-bananapi-m2-berry.dtb - dtb-$(CONFIG_MACH_SUN8I_R528) += \ -- sun8i-t113s-mangopi-mq-r-t113.dtb -+ sun8i-t113s-mangopi-mq-r-t113.dtb \ -+ sun8i-t113s-mangopi-mqdual-t113.dtb - dtb-$(CONFIG_MACH_SUN50I_H5) += \ - sun50i-h5-bananapi-m2-plus.dtb \ - sun50i-h5-emlid-neutis-n5-devboard.dtb \ --- /dev/null -+++ b/arch/arm/dts/sun8i-t113s-mangopi-mqdual-t113.dts ++++ b/dts/upstream/src/arm/allwinner/sun8i-t113s-mangopi-mqdual-t113.dts @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2022 Arm Ltd. @@ -82,7 +70,7 @@ Signed-off-by: Zoltan HERPAI @@ -0,0 +1,17 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-t113s-mangopi-mqdual-t113" ++CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun8i-t113s-mangopi-mqdual-t113" +CONFIG_SUNXI_MINIMUM_DRAM_MB=128 +CONFIG_SPL=y +CONFIG_MACH_SUN8I_R528=y diff --git a/package/boot/uboot-sunxi/patches/404-sunxi-add-support-for-MYIR-MYD113X-boards.patch b/package/boot/uboot-sunxi/patches/404-sunxi-add-support-for-MYIR-MYD113X-boards.patch index 9626d242ccc..4e6b2f8f57f 100644 --- a/package/boot/uboot-sunxi/patches/404-sunxi-add-support-for-MYIR-MYD113X-boards.patch +++ b/package/boot/uboot-sunxi/patches/404-sunxi-add-support-for-MYIR-MYD113X-boards.patch @@ -1,18 +1,79 @@ ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -652,7 +652,9 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \ - sun8i-v40-bananapi-m2-berry.dtb - dtb-$(CONFIG_MACH_SUN8I_R528) += \ - sun8i-t113s-mangopi-mq-r-t113.dtb \ -- sun8i-t113s-mangopi-mqdual-t113.dtb -+ sun8i-t113s-mangopi-mqdual-t113.dtb \ -+ sun8i-t113s-myir-myd-yt113x-emmc.dtb \ -+ sun8i-t113s-myir-myd-yt113x-spi.dtb - dtb-$(CONFIG_MACH_SUN50I_H5) += \ - sun50i-h5-bananapi-m2-plus.dtb \ - sun50i-h5-emlid-neutis-n5-devboard.dtb \ --- /dev/null -+++ b/arch/arm/dts/sun8i-t113s-myir-myd-yt113x-emmc.dts ++++ b/configs/myir_myd_t113x-emmc_defconfig +@@ -0,0 +1,29 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun8i-t113s-myir-myd-yt113x-emmc" ++CONFIG_SUNXI_MINIMUM_DRAM_MB=128 ++CONFIG_SPL=y ++CONFIG_MACH_SUN8I_R528=y ++CONFIG_CONS_INDEX=6 ++CONFIG_MMC0_CD_PIN="PF6" ++CONFIG_MMC_SUNXI_SLOT_EXTRA=2 ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SYS_MONITOR_LEN=786432 ++CONFIG_DRAM_CLK=792 ++CONFIG_DRAM_ZQ=8092667 ++CONFIG_DRAM_SUNXI_ODT_EN=0 ++CONFIG_DRAM_SUNXI_TPR0=0x004a2195 ++CONFIG_DRAM_SUNXI_TPR11=0x340000 ++CONFIG_DRAM_SUNXI_TPR12=0x46 ++CONFIG_DRAM_SUNXI_TPR13=0x34000100 ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_OHCI_HCD=y ++CONFIG_PHY_MOTORCOMM=y ++CONFIG_SUN8I_EMAC=y ++CONFIG_RGMII=y ++CONFIG_RMII=y ++CONFIG_SUPPORT_EMMC_BOOT=y ++CONFIG_MMC_IO_VOLTAGE=y ++CONFIG_SPL_MMC_IO_VOLTAGE=y ++CONFIG_MMC_HS200_SUPPORT=y ++CONFIG_SPL_MMC_HS200_SUPPORT=y +--- /dev/null ++++ b/configs/myir_myd_t113x-spi_defconfig +@@ -0,0 +1,39 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun8i-t113s-myir-myd-yt113x-spi" ++CONFIG_SUNXI_MINIMUM_DRAM_MB=128 ++CONFIG_SPL=y ++CONFIG_SPL_SPI_SUNXI=y ++CONFIG_MTD_SPI_NAND=y ++CONFIG_MACH_SUN8I_R528=y ++CONFIG_CONS_INDEX=6 ++CONFIG_MMC0_CD_PIN="PF6" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SYS_MONITOR_LEN=786432 ++CONFIG_DRAM_CLK=792 ++CONFIG_DRAM_ZQ=8092667 ++CONFIG_DRAM_SUNXI_ODT_EN=0 ++CONFIG_DRAM_SUNXI_TPR0=0x004a2195 ++CONFIG_DRAM_SUNXI_TPR11=0x340000 ++CONFIG_DRAM_SUNXI_TPR12=0x46 ++CONFIG_DRAM_SUNXI_TPR13=0x34000100 ++CONFIG_CLK_SUN20I_D1=y ++CONFIG_PHY_MOTORCOMM=y ++CONFIG_SUN8I_EMAC=y ++CONFIG_RGMII=y ++CONFIG_RMII=y ++CONFIG_MTD=y ++CONFIG_DM_MTD=y ++CONFIG_SYS_MTDPARTS_RUNTIME=y ++CONFIG_NAND_STM32_FMC2=y ++CONFIG_SYS_NAND_ONFI_DETECTION=y ++CONFIG_MTD_SPI_NAND=y ++CONFIG_DM_SPI_FLASH=y ++CONFIG_SPI_FLASH_MACRONIX=y ++CONFIG_SPI_FLASH_SPANSION=y ++CONFIG_SPI_FLASH_STMICRO=y ++CONFIG_SPI_FLASH_WINBOND=y ++# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set ++CONFIG_SPI_FLASH_MTD=y ++CONFIG_SPI=y ++CONFIG_MTD_UBI_FASTMAP=y +--- /dev/null ++++ b/dts/upstream/src/arm/allwinner/sun8i-t113s-myir-myd-yt113x-emmc.dts @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2022 Arm Ltd. @@ -47,7 +108,7 @@ + }; +}; --- /dev/null -+++ b/arch/arm/dts/sun8i-t113s-myir-myd-yt113x-spi.dts ++++ b/dts/upstream/src/arm/allwinner/sun8i-t113s-myir-myd-yt113x-spi.dts @@ -0,0 +1,50 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2025 Zoltan HERPAI @@ -100,81 +161,7 @@ + }; +}; --- /dev/null -+++ b/configs/myir_myd_t113x-emmc_defconfig -@@ -0,0 +1,29 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-t113s-myir-myd-yt113x-emmc" -+CONFIG_SUNXI_MINIMUM_DRAM_MB=128 -+CONFIG_SPL=y -+CONFIG_MACH_SUN8I_R528=y -+CONFIG_CONS_INDEX=6 -+CONFIG_MMC0_CD_PIN="PF6" -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_SYS_MONITOR_LEN=786432 -+CONFIG_DRAM_CLK=792 -+CONFIG_DRAM_ZQ=8092667 -+CONFIG_DRAM_SUNXI_ODT_EN=0 -+CONFIG_DRAM_SUNXI_TPR0=0x004a2195 -+CONFIG_DRAM_SUNXI_TPR11=0x340000 -+CONFIG_DRAM_SUNXI_TPR12=0x46 -+CONFIG_DRAM_SUNXI_TPR13=0x34000100 -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_OHCI_HCD=y -+CONFIG_PHY_MOTORCOMM=y -+CONFIG_SUN8I_EMAC=y -+CONFIG_RGMII=y -+CONFIG_RMII=y -+CONFIG_SUPPORT_EMMC_BOOT=y -+CONFIG_MMC_IO_VOLTAGE=y -+CONFIG_SPL_MMC_IO_VOLTAGE=y -+CONFIG_MMC_HS200_SUPPORT=y -+CONFIG_SPL_MMC_HS200_SUPPORT=y ---- /dev/null -+++ b/configs/myir_myd_t113x-spi_defconfig -@@ -0,0 +1,39 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-t113s-myir-myd-yt113x-spi" -+CONFIG_SUNXI_MINIMUM_DRAM_MB=128 -+CONFIG_SPL=y -+CONFIG_SPL_SPI_SUNXI=y -+CONFIG_MTD_SPI_NAND=y -+CONFIG_MACH_SUN8I_R528=y -+CONFIG_CONS_INDEX=6 -+CONFIG_MMC0_CD_PIN="PF6" -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_SYS_MONITOR_LEN=786432 -+CONFIG_DRAM_CLK=792 -+CONFIG_DRAM_ZQ=8092667 -+CONFIG_DRAM_SUNXI_ODT_EN=0 -+CONFIG_DRAM_SUNXI_TPR0=0x004a2195 -+CONFIG_DRAM_SUNXI_TPR11=0x340000 -+CONFIG_DRAM_SUNXI_TPR12=0x46 -+CONFIG_DRAM_SUNXI_TPR13=0x34000100 -+CONFIG_CLK_SUN20I_D1=y -+CONFIG_PHY_MOTORCOMM=y -+CONFIG_SUN8I_EMAC=y -+CONFIG_RGMII=y -+CONFIG_RMII=y -+CONFIG_MTD=y -+CONFIG_DM_MTD=y -+CONFIG_SYS_MTDPARTS_RUNTIME=y -+CONFIG_NAND_STM32_FMC2=y -+CONFIG_SYS_NAND_ONFI_DETECTION=y -+CONFIG_MTD_SPI_NAND=y -+CONFIG_DM_SPI_FLASH=y -+CONFIG_SPI_FLASH_MACRONIX=y -+CONFIG_SPI_FLASH_SPANSION=y -+CONFIG_SPI_FLASH_STMICRO=y -+CONFIG_SPI_FLASH_WINBOND=y -+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -+CONFIG_SPI_FLASH_MTD=y -+CONFIG_SPI=y -+CONFIG_MTD_UBI_FASTMAP=y ---- /dev/null -+++ b/arch/arm/dts/sun8i-t113s-myir-myd-yt113x.dtsi ++++ b/dts/upstream/src/arm/allwinner/sun8i-t113s-myir-myd-yt113x.dtsi @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2025 Zoltan HERPAI diff --git a/package/boot/uboot-sunxi/patches/405-sunxi-add-support-for-UART3-on-PE-pins.patch b/package/boot/uboot-sunxi/patches/405-sunxi-add-support-for-UART3-on-PE-pins.patch index 875981b1a09..f4941d9cdc5 100644 --- a/package/boot/uboot-sunxi/patches/405-sunxi-add-support-for-UART3-on-PE-pins.patch +++ b/package/boot/uboot-sunxi/patches/405-sunxi-add-support-for-UART3-on-PE-pins.patch @@ -18,7 +18,7 @@ Signed-off-by: Zoltan HERPAI --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig -@@ -897,6 +897,12 @@ config UART0_PORT_F +@@ -899,6 +899,12 @@ config UART0_PORT_F at the same time, the system can be only booted in the FEL mode. Only enable this if you really know what you are doing. @@ -58,9 +58,9 @@ Signed-off-by: Zoltan HERPAI sunxi_gpio_set_pull(SUNXI_GPE(7), SUNXI_GPIO_PULL_UP); #elif CONFIG_CONS_INDEX == 2 && defined(CONFIG_MACH_SUN8I) && \ !defined(CONFIG_MACH_SUN8I_R40) ---- a/arch/riscv/dts/sunxi-d1s-t113.dtsi -+++ b/arch/riscv/dts/sunxi-d1s-t113.dtsi -@@ -145,6 +145,12 @@ +--- a/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi ++++ b/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi +@@ -193,6 +193,12 @@ }; /omit-if-no-ref/ diff --git a/package/boot/uboot-sunxi/patches/406-sunxi-add-support-for-Rongpin-RP-T113-board.patch b/package/boot/uboot-sunxi/patches/406-sunxi-add-support-for-Rongpin-RP-T113-board.patch index e373eccf956..aab2c1fade1 100644 --- a/package/boot/uboot-sunxi/patches/406-sunxi-add-support-for-Rongpin-RP-T113-board.patch +++ b/package/boot/uboot-sunxi/patches/406-sunxi-add-support-for-Rongpin-RP-T113-board.patch @@ -12,20 +12,8 @@ Signed-off-by: Zoltan HERPAI create mode 100644 arch/arm/dts/sun8i-t113s-rongpin-rp-t113.dts create mode 100644 configs/rongpin_rp_t113_defconfig ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -654,7 +654,8 @@ dtb-$(CONFIG_MACH_SUN8I_R528) += \ - sun8i-t113s-mangopi-mq-r-t113.dtb \ - sun8i-t113s-mangopi-mqdual-t113.dtb \ - sun8i-t113s-myir-myd-yt113x-emmc.dtb \ -- sun8i-t113s-myir-myd-yt113x-spi.dtb -+ sun8i-t113s-myir-myd-yt113x-spi.dtb \ -+ sun8i-t113s-rongpin-rp-t113.dtb - dtb-$(CONFIG_MACH_SUN50I_H5) += \ - sun50i-h5-bananapi-m2-plus.dtb \ - sun50i-h5-emlid-neutis-n5-devboard.dtb \ --- /dev/null -+++ b/arch/arm/dts/sun8i-t113s-rongpin-rp-t113.dts ++++ b/dts/upstream/src/arm/allwinner/sun8i-t113s-rongpin-rp-t113.dts @@ -0,0 +1,99 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2022 Arm Ltd. @@ -131,7 +119,7 @@ Signed-off-by: Zoltan HERPAI @@ -0,0 +1,18 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-t113s-rongpin-rp-t113" ++CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun8i-t113s-rongpin-rp-t113" +CONFIG_SUNXI_MINIMUM_DRAM_MB=128 +CONFIG_SPL=y +CONFIG_MACH_SUN8I_R528=y diff --git a/package/boot/uboot-sunxi/patches/407-sunxi-add-support-for-emac-on-PG-pins.patch b/package/boot/uboot-sunxi/patches/407-sunxi-add-support-for-emac-on-PG-pins.patch index 960b2ab4ea6..a2aae5051c0 100644 --- a/package/boot/uboot-sunxi/patches/407-sunxi-add-support-for-emac-on-PG-pins.patch +++ b/package/boot/uboot-sunxi/patches/407-sunxi-add-support-for-emac-on-PG-pins.patch @@ -10,9 +10,9 @@ Signed-off-by: Zoltan HERPAI arch/riscv/dts/sunxi-d1s-t113.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) ---- a/arch/riscv/dts/sunxi-d1s-t113.dtsi -+++ b/arch/riscv/dts/sunxi-d1s-t113.dtsi -@@ -114,6 +114,14 @@ +--- a/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi ++++ b/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi +@@ -144,6 +144,14 @@ }; /omit-if-no-ref/ diff --git a/package/boot/uboot-sunxi/patches/408-sunxi-enable-emac-on-Rongpin-RP-T113.patch b/package/boot/uboot-sunxi/patches/408-sunxi-enable-emac-on-Rongpin-RP-T113.patch index 95c0bbd4024..f8b101a8204 100644 --- a/package/boot/uboot-sunxi/patches/408-sunxi-enable-emac-on-Rongpin-RP-T113.patch +++ b/package/boot/uboot-sunxi/patches/408-sunxi-enable-emac-on-Rongpin-RP-T113.patch @@ -27,8 +27,8 @@ Signed-off-by: Zoltan HERPAI configs/rongpin_rp_t113_defconfig | 3 +++ 2 files changed, 31 insertions(+) ---- a/arch/arm/dts/sun8i-t113s-rongpin-rp-t113.dts -+++ b/arch/arm/dts/sun8i-t113s-rongpin-rp-t113.dts +--- a/dts/upstream/src/arm/allwinner/sun8i-t113s-rongpin-rp-t113.dts ++++ b/dts/upstream/src/arm/allwinner/sun8i-t113s-rongpin-rp-t113.dts @@ -55,6 +55,16 @@ regulator-max-microvolt = <2800000>; vin-supply = <®_3v3>; diff --git a/package/boot/uboot-sunxi/patches/409-sunxi-r528-d1-t113-add-SDC2-pinmux-on-PC2-7-pins.patch b/package/boot/uboot-sunxi/patches/409-sunxi-r528-d1-t113-add-SDC2-pinmux-on-PC2-7-pins.patch index 603865e5cba..9d54ae99106 100644 --- a/package/boot/uboot-sunxi/patches/409-sunxi-r528-d1-t113-add-SDC2-pinmux-on-PC2-7-pins.patch +++ b/package/boot/uboot-sunxi/patches/409-sunxi-r528-d1-t113-add-SDC2-pinmux-on-PC2-7-pins.patch @@ -10,7 +10,7 @@ Signed-off-by: Zoltan HERPAI --- a/board/sunxi/board.c +++ b/board/sunxi/board.c -@@ -419,6 +419,13 @@ static void mmc_pinmux_setup(int sdc) +@@ -428,6 +428,13 @@ static void mmc_pinmux_setup(int sdc) sunxi_gpio_set_cfgpin(SUNXI_GPC(24), SUNXI_GPC_SDC2); sunxi_gpio_set_pull(SUNXI_GPC(24), SUNXI_GPIO_PULL_UP); sunxi_gpio_set_drv(SUNXI_GPC(24), 2); diff --git a/package/boot/uboot-sunxi/patches/410-sunxi-support-console-on-uart4-pd.patch b/package/boot/uboot-sunxi/patches/410-sunxi-support-console-on-uart4-pd.patch index f60a3809238..6a354d878ae 100644 --- a/package/boot/uboot-sunxi/patches/410-sunxi-support-console-on-uart4-pd.patch +++ b/package/boot/uboot-sunxi/patches/410-sunxi-support-console-on-uart4-pd.patch @@ -21,9 +21,9 @@ { "uart5", 3 }, /* PE6-PE7 */ }; ---- a/arch/riscv/dts/sunxi-d1s-t113.dtsi -+++ b/arch/riscv/dts/sunxi-d1s-t113.dtsi -@@ -163,6 +163,12 @@ +--- a/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi ++++ b/dts/upstream/src/riscv/allwinner/sunxi-d1s-t113.dtsi +@@ -211,6 +211,12 @@ pins = "PE2", "PE3"; function = "uart0"; }; diff --git a/package/boot/uboot-sunxi/patches/411-sunxi-dts-add-olinuxino-t113.patch b/package/boot/uboot-sunxi/patches/411-sunxi-dts-add-olinuxino-t113.patch index ee4717fe889..85d81f0f2c7 100644 --- a/package/boot/uboot-sunxi/patches/411-sunxi-dts-add-olinuxino-t113.patch +++ b/package/boot/uboot-sunxi/patches/411-sunxi-dts-add-olinuxino-t113.patch @@ -1,15 +1,5 @@ ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -655,6 +655,7 @@ dtb-$(CONFIG_MACH_SUN8I_R528) += \ - sun8i-t113s-mangopi-mqdual-t113.dtb \ - sun8i-t113s-myir-myd-yt113x-emmc.dtb \ - sun8i-t113s-myir-myd-yt113x-spi.dtb \ -+ sun8i-t113s-olinuxino.dtb \ - sun8i-t113s-rongpin-rp-t113.dtb - dtb-$(CONFIG_MACH_SUN50I_H5) += \ - sun50i-h5-bananapi-m2-plus.dtb \ --- /dev/null -+++ b/arch/arm/dts/sun8i-t113s-olinuxino.dts ++++ b/dts/upstream/src/arm/allwinner/sun8i-t113s-olinuxino.dts @@ -0,0 +1,193 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// Copyright (C) 2022 Arm Ltd. @@ -209,7 +199,7 @@ @@ -0,0 +1,41 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-t113s-olinuxino" ++CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun8i-t113s-olinuxino" +CONFIG_SUNXI_MINIMUM_DRAM_MB=128 +CONFIG_SPL=y +CONFIG_MACH_SUN8I_R528=y