diff --git a/config/kernel/linux-arm64-wdk2023.config b/config/kernel/linux-arm64-wdk2023.config index f7b25211e1f8..1ba41a2d53c1 100644 --- a/config/kernel/linux-arm64-wdk2023.config +++ b/config/kernel/linux-arm64-wdk2023.config @@ -1183,6 +1183,7 @@ CONFIG_MT76x0U=m CONFIG_MT76x0E=m CONFIG_MT76x2E=m CONFIG_MT76x2U=m +CONFIG_MT7921U=m CONFIG_RT2X00=m CONFIG_RT2400PCI=m CONFIG_RT2500PCI=m diff --git a/config/kernel/linux-bcm2711-legacy.config b/config/kernel/linux-bcm2711-legacy.config index 7c1d3b945e1e..1bf8d8651798 100644 --- a/config/kernel/linux-bcm2711-legacy.config +++ b/config/kernel/linux-bcm2711-legacy.config @@ -700,6 +700,7 @@ CONFIG_MT76x0U=m CONFIG_MT76x2U=m CONFIG_MT7915E=m CONFIG_MT7921E=m +CONFIG_MT7921U=m CONFIG_RT2X00=m CONFIG_RT2500USB=m CONFIG_RT73USB=m diff --git a/config/kernel/linux-k3-current.config b/config/kernel/linux-k3-current.config index 8419baf106b7..0edb9572294e 100644 --- a/config/kernel/linux-k3-current.config +++ b/config/kernel/linux-k3-current.config @@ -347,6 +347,7 @@ CONFIG_IWLMVM=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m +CONFIG_MT7921U=m CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m CONFIG_INPUT_MATRIXKMAP=y diff --git a/config/kernel/linux-odroidxu4-current.config b/config/kernel/linux-odroidxu4-current.config index d8588fab8674..fa2a487f3fc6 100644 --- a/config/kernel/linux-odroidxu4-current.config +++ b/config/kernel/linux-odroidxu4-current.config @@ -696,6 +696,7 @@ CONFIG_MWIFIEX_USB=m CONFIG_MT7601U=m CONFIG_MT76x0U=m CONFIG_MT76x2U=m +CONFIG_MT7921U=m CONFIG_RT2X00=m CONFIG_RT2500USB=m CONFIG_RT73USB=m diff --git a/config/kernel/linux-phytium-embedded-current.config b/config/kernel/linux-phytium-embedded-current.config index 97a659d68d6e..4ad82730f5be 100644 --- a/config/kernel/linux-phytium-embedded-current.config +++ b/config/kernel/linux-phytium-embedded-current.config @@ -334,6 +334,7 @@ CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m CONFIG_MT7921E=m +CONFIG_MT7921U=m CONFIG_RTW88=m CONFIG_RTW88_8821CS=m CONFIG_RSI_91X=m diff --git a/config/kernel/linux-tqma-current.config b/config/kernel/linux-tqma-current.config index fe460d14e04b..d0fdecc6a2fb 100644 --- a/config/kernel/linux-tqma-current.config +++ b/config/kernel/linux-tqma-current.config @@ -363,6 +363,7 @@ CONFIG_BRCMFMAC=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_PCIE=m +CONFIG_MT7921U=m CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m CONFIG_INPUT_EVDEV=y diff --git a/lib/functions/compilation/kernel-debs.sh b/lib/functions/compilation/kernel-debs.sh index 11b8e21ab067..0721fba1ffad 100644 --- a/lib/functions/compilation/kernel-debs.sh +++ b/lib/functions/compilation/kernel-debs.sh @@ -331,6 +331,9 @@ function kernel_package_callback_linux_dtb() { mkdir -p "${package_directory}/boot/" run_host_command_logged cp -rp "${tmp_kernel_install_dirs[INSTALL_DTBS_PATH]}" "${package_directory}/boot/dtb-${kernel_version_family}" + # Create symlink for old Orange Pi 3B device tree for transition from custom to mainline dtb: https://dietpi.com/forum/t/20689/22 + [[ -f "${package_directory}/boot/dtb-${kernel_version_family}/rockchip/rk3566-orangepi-3b-v1.1.dtb" && ! -f "${package_directory}/boot/dtb-${kernel_version_family}/rockchip/rk3566-orangepi-3b.dtb" ]] && run_host_command_logged ln -s 'rk3566-orangepi-3b-v1.1.dtb' "${package_directory}/boot/dtb-${kernel_version_family}/rockchip/rk3566-orangepi-3b.dtb" + # Generate a control file cat <<- CONTROL_FILE > "${package_DEBIAN_dir}/control" Version: ${artifact_version} diff --git a/lib/functions/general/bat-cat.sh b/lib/functions/general/bat-cat.sh index f389909efa2a..1dc4486045d0 100644 --- a/lib/functions/general/bat-cat.sh +++ b/lib/functions/general/bat-cat.sh @@ -9,7 +9,7 @@ function run_tool_batcat() { # Default version - BATCAT_VERSION=${BATCAT_VERSION:-0.24.0} # https://github.com/sharkdp/bat/releases + BATCAT_VERSION=${BATCAT_VERSION:-0.25.0} # https://github.com/sharkdp/bat/releases declare non_cache_dir="/armbian-tools/batcat" # To deploy/reuse cached batcat in a Docker image. diff --git a/patch/kernel/archive/meson64-6.12/board-odroidc2-fix-reboot.patch b/patch/kernel/archive/meson64-6.12/board-odroidc2-fix-reboot.patch new file mode 100644 index 000000000000..ac6cf9f26d4b --- /dev/null +++ b/patch/kernel/archive/meson64-6.12/board-odroidc2-fix-reboot.patch @@ -0,0 +1,13 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +index e6d2de7..662b4be 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +@@ -102,7 +102,7 @@ + /* + * signal name from schematics: TF_3V3N_1V8_EN + */ +- gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; ++ gpios = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; + gpios-states = <0>; + + states = <3300000 0>, diff --git a/patch/kernel/archive/meson64-6.6/board-odroidc2-fix-reboot.patch b/patch/kernel/archive/meson64-6.6/board-odroidc2-fix-reboot.patch new file mode 100644 index 000000000000..ac6cf9f26d4b --- /dev/null +++ b/patch/kernel/archive/meson64-6.6/board-odroidc2-fix-reboot.patch @@ -0,0 +1,13 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +index e6d2de7..662b4be 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +@@ -102,7 +102,7 @@ + /* + * signal name from schematics: TF_3V3N_1V8_EN + */ +- gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; ++ gpios = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; + gpios-states = <0>; + + states = <3300000 0>, diff --git a/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index 02af8b670c77..f177410c4fd5 100644 --- a/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.1/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index ad81ccf01ee7..37fd4c9fcfce 100644 --- a/patch/kernel/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.10/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot index df71fab3cf4e..032849663443 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index ad81ccf01ee7..37fd4c9fcfce 100644 --- a/patch/kernel/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.11/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot index df71fab3cf4e..032849663443 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index 628fa13bfd79..705931ce7c5a 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index 628fa13bfd79..705931ce7c5a 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index ad81ccf01ee7..37fd4c9fcfce 100644 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -11,31 +11,11 @@ diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts b/arch/arm/boot index df71fab3cf4e..032849663443 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h3-nanopi-neo.dts -@@ -49,6 +49,63 @@ / { +@@ -49,6 +49,43 @@ / { aliases { ethernet0 = &emac; }; + -+ /* Warning: sunxi-5.18: -+ * The leds node is present in the sun8i-h3-nanopi.dtsi file -+ * You will have to fix this situation yourself -+ */ -+ leds { -+ compatible = "gpio-leds"; -+ -+ pwr { -+ label = "nanopi:red:pwr"; -+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ -+ linux,default-trigger = "default-on"; -+ }; -+ -+ status { -+ label = "nanopi:green:status"; -+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ + vdd_cpux: gpio-regulator { + compatible = "regulator-gpio"; + pinctrl-names = "default"; diff --git a/patch/u-boot/u-boot-radxa-latest/board_radxa-zero3-fix-dtb-choice.patch b/patch/u-boot/u-boot-radxa-latest/board_radxa-zero3-fix-dtb-choice.patch new file mode 100644 index 000000000000..fc4f198820f8 --- /dev/null +++ b/patch/u-boot/u-boot-radxa-latest/board_radxa-zero3-fix-dtb-choice.patch @@ -0,0 +1,19 @@ +diff --git a/board/rockchip/evb_rk3568/evb_rk3568.c b/board/rockchip/evb_rk3568/evb_rk3568.c +index 43b8de4..72a419b 100644 +--- a/board/rockchip/evb_rk3568/evb_rk3568.c ++++ b/board/rockchip/evb_rk3568/evb_rk3568.c +@@ -24,10 +24,10 @@ struct variant_def { + + #ifdef CONFIG_ID_EEPROM + static struct variant_def variants[] = { +- {"radxa,zero3", 230, 270, 0, -1, "rockchip/rk3566-radxa-zero-3w-aic8800ds2.dtb"}, +- {"radxa,zero3", 400, 450, 0, -1, "rockchip/rk3566-radxa-zero-3e.dtb"}, +- {"radxa,zero3", 451, 510, 0, -1, "rockchip/rk3566-radxa-zero-3w-ap6212.dtb"}, +- {"radxa,rock-3c", 300, 360, 0, -1, "rockchip/rk3566-rock-3c-aic8800ds2.dtb"}, ++ {"radxa,zero3", 230, 270, 0, -1, "rockchip/rk3566-radxa-zero3.dtb"}, ++ {"radxa,zero3", 400, 450, 0, -1, "rockchip/rk3566-radxa-zero3.dtb"}, ++ {"radxa,zero3", 451, 510, 0, -1, "rockchip/rk3566-radxa-zero3-ap6212.dtb"}, ++ {"radxa,rock-3c", 300, 360, 0, -1, "rockchip/rk3566-rock-3c.dtb"}, + }; + + static void set_fdtfile(void) diff --git a/patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch deleted file mode 100644 index d7f8141477ff..000000000000 --- a/patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Mon, 14 Nov 2022 14:59:45 +0100 -Subject: meson64 u-boot v2022.10: change `BOOT_TARGET_DEVICES to try to boot - USB, NVME and SCSI before SD, MMC, PXE, DHCP - ---- - include/configs/meson64.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index 40803ee9da1..af7b764da6a 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -64,12 +64,12 @@ - #ifndef BOOT_TARGET_DEVICES - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ -- func(MMC, mmc, 0) \ -- func(MMC, mmc, 1) \ -- func(MMC, mmc, 2) \ - BOOT_TARGET_DEVICES_USB(func) \ - BOOT_TARGET_NVME(func) \ - BOOT_TARGET_SCSI(func) \ -+ func(MMC, mmc, 0) \ -+ func(MMC, mmc, 1) \ -+ func(MMC, mmc, 2) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - #endif --- -Armbian -