Merge branch 'main' into fix-rockpi-e-gbe

.github/CODEOWNERS

@@ -91,15 +91,15 @@ config/boards/nanopineo.csc		@spendist
 config/boards/nanopineo2.csc		@spendist
 config/boards/nanopineocore2.csc		@AGM1968
 config/boards/nanopineoplus2.csc		@teknoid
-config/boards/odroidc1.eos		@juanlufont
+config/boards/odroidc1.csc		@juanlufont
 config/boards/odroidc2.conf		@teknoid
 config/boards/odroidc4.conf		@igorpecovnik
 config/boards/odroidhc4.conf		@igorpecovnik
 config/boards/odroidm1.conf		@rpardini
 config/boards/odroidn2.conf		@NicoD-SBC
 config/boards/odroidxu4.conf		@joekhoobyar
 config/boards/olimex-teres-a64.csc		@Kreyren
-config/boards/onecloud.eos		@hzyitc
+config/boards/onecloud.csc		@hzyitc
 config/boards/oneplus-kebab.conf		@amazingfate
 config/boards/orangepi4-lts.conf		@paolosabatino
 config/boards/orangepi4.csc		@paolosabatino

config/boards/aml-s805-mxq.tvb

@@ -0,0 +1,14 @@
+# MXQ TV box based on Amlogic S805 quad core 1GB RAM SoC GBE
+BOARD_NAME="MXQ"
+BOARDFAMILY="meson8b"
+BOARD_MAINTAINER=""
+KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
+BOOTCONFIG="none"
+BOOTSCRIPT="boot-aml-s805-mxq.cmd:boot.cmd"
+# The preinstalled U-BOOT looks for this script
+BOOTSCRIPT_OUTPUT="s805_autoscript"
+BOOTENV_FILE="aml-s805-mxq.txt"
+
+BOOTSIZE="200"
+BOOTFS_TYPE="fat"

config/boards/armsom-cm5-io.csc

@@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
-function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
-	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
-	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
-	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-cm5-io_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-cm5 audios" "info"
 

config/boards/armsom-cm5-rpi-cm4-io.csc

@@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
-function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
-	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
-	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
-	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-cm5-rpi-cm4-io_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-cm5-rpi-cm4-io audios" "info"
 

config/boards/armsom-sige5.csc

@@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
-function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
-	declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
-	declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
-	declare -g BOOTDIR="u-boot-${BOARD}"
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-sige7_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-sige7 audios" "info"
 

config/boards/armsom-sige7.csc

@@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="armsom-sige7-rk3588_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-armsom-sige7.dtb"

config/boards/bananapim7.conf

@@ -3,6 +3,6 @@ BOARD_NAME="Banana Pi M7"
 BOARD_MAINTAINER="amazingfate"
 BOOT_FDT_FILE="rockchip/rk3588-bananapi-m7.dtb"
 # Those are included in armsom-sige7.csc, but this file is parsed directly by the JSON matrix generator and thus those need to be in here
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 BOARDFAMILY="rockchip-rk3588"

config/boards/cm3588-nas.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="cm3588-nas-rk3588_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"

config/boards/indiedroid-nova.csc

@@ -4,7 +4,7 @@ declare -g BOARD_MAINTAINER="lanefu"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOOTCONFIG="indiedroid_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 declare -g BOOT_SOC="rk3588"
-declare -g KERNEL_TARGET="edge,current,vendor"
+declare -g KERNEL_TARGET="current,edge,vendor"
 declare -g FULL_DESKTOP="yes"
 declare -g BOOT_LOGO="desktop"
 declare -g BOOT_FDT_FILE="rockchip/rk3588s-indiedroid-nova.dtb"

config/boards/khadas-edge2.conf

@@ -3,7 +3,7 @@ declare -g BOARD_NAME="Khadas Edge2"
 declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER="efectn"
 declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
-declare -g KERNEL_TARGET="edge,current,vendor"
+declare -g KERNEL_TARGET="current,edge,vendor"
 declare -g KERNEL_TEST_TARGET="vendor,current"
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g KERNEL_UPGRADE_FREEZE="[email protected]"

config/boards/mba8mpxl-ras314.conf

@@ -19,7 +19,7 @@ function post_family_tweaks_bsp__mba8mpxl-ras314() {
 	wget https://github.com/nxp-imx/imx-firmware/raw/lf-6.6.3_1.0.0/nxp/FwImage_8997/pcieuart8997_combo_v4.bin
 	run_host_command_logged mkdir -pv --mode=755 "$destination/lib/firmware/" || exit_with_error "Unable to mkdir firmware"
 	run_host_command_logged mkdir -v --mode=775 "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to mkdir mrvl"
-	run_host_command_logged cp -Pv "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"
+	run_host_command_logged mv -v "pcieuart8997_combo_v4.bin" "$destination/lib/firmware/mrvl/" || exit_with_error "Unable to copy mrvl firmware"
 
 	# Add udev rule to delay btnxpuart loading
 	cat <<- NXP_UDEV_RULE > "${destination}"/etc/udev/rules.d/10-nxp-bluetooth-delay.rules

config/boards/mksklipad50.csc

@@ -5,7 +5,7 @@ BOARD_MAINTAINER="torte71"
 BOOTCONFIG="mksklipad50-rk3328_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-FULL_DESKTOP="yes"
+HAS_VIDEO_OUTPUT="no"
 BOOT_LOGO="desktop"
 MODULES="pinctrl-rk805 ads7846 spidev"
 BOOTFS_TYPE="fat"

config/boards/mkspi.csc

@@ -11,7 +11,8 @@ BOARD_MAINTAINER="redrathnure"
 BOOTCONFIG="mkspi-rk3328_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
-FULL_DESKTOP="yes"
+#No need to build Desktop images, minimal set will be installed together with KlipperScreen
+HAS_VIDEO_OUTPUT="no"
 BOOT_LOGO="desktop"
 MODULES="ads7846 spidev"
 BOOTFS_TYPE="fat"

config/boards/nanopct6-lts.conf

@@ -5,5 +5,5 @@ BOARD_NAME="NanoPC T6 LTS"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOT_FDT_FILE="rockchip/rk3588-nanopc-t6-lts.dtb" # As opposed to "rockchip/rk3588-nanopc-t6.dtb" for the non-LTS version
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"

config/boards/nanopct6.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="SuperKali Tonymac32"
 BOOTCONFIG="nanopc_t6_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/nanopi-m6.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-m6-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/nanopi-r3s.csc

@@ -2,6 +2,7 @@
 BOARD_NAME="NanoPi R3S"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
+HAS_VIDEO_OUTPUT="no"
 BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current,edge"

config/boards/nanopi-r6c.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="ColorfulRhino"
 BOOTCONFIG="nanopi-r6c-rk3588s_defconfig" # Mainline defconfig, enables booting from NVMe
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 IMAGE_PARTITION_TABLE="gpt"

config/boards/nanopi-r6s.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="efectn"
 BOOTCONFIG="nanopi-r6s-rk3588s_defconfig" # Mainline defconfig
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/odroidc1.eos → config/boards/odroidc1.csc

@@ -2,7 +2,7 @@
 BOARD_NAME="Odroid C1"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER="juanlufont"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 KERNEL_TEST_TARGET="current"
 
 BOOTDIR='u-boot-odroidc1'

config/boards/onecloud.eos → config/boards/onecloud.csc

@@ -2,7 +2,7 @@
 BOARD_NAME="OneCloud"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER="hzyitc"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 KERNEL_TEST_TARGET="current"
 BOOTCONFIG="none"
 BOOTSCRIPT="boot-onecloud.cmd:boot.cmd"

config/boards/orangepi5-plus.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="alexl83"
 BOOTCONFIG="orangepi-5-plus-rk3588_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/orangepi5.conf

@@ -5,7 +5,7 @@ BOARD_MAINTAINER="efectn"
 BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/radxa-e25.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Radxa E25"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="krachlatte"
 BOOTCONFIG="radxa-e25-rk3568_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/rock-3a.conf

@@ -4,7 +4,7 @@ BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER="ZazaBR amazingfate catalinii vamzii"
 BOOTCONFIG="rock-3a-rk3568_defconfig"
 BOOTCONFIG_SATA="rock-3a-sata-rk3568_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/rock-5a.conf

@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5A"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate"
 BOOTCONFIG="rock-5a-rk3588s_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/rock-5b.conf

@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5B"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="amazingfate linhz0hz"
 BOOTCONFIG="rock-5b-rk3588_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/station-m2.csc

@@ -3,7 +3,7 @@ BOARD_NAME="Station M2"
 BOARDFAMILY="rk35xx"
 BOARD_MAINTAINER=""
 BOOTCONFIG="station-m2-rk3566_defconfig"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/turing-rk1.csc

@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER=""
 BOOTCONFIG="turing-rk1-rk3588_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="edge,current,vendor"
+KERNEL_TARGET="current,edge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/bootenv/aml-s805-mxq.txt

@@ -0,0 +1,3 @@
+dtb_file=/dtb/meson8b-mxq.dtb
+
+# The following contents are auto-generated.

config/bootscripts/boot-aml-s805-mxq.cmd

@@ -0,0 +1,45 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv rootdev "LABEL=armbi_root"
+setenv rootfstype "ext4"
+
+# Default Console Device Setting
+setenv console "both"
+setenv verbosity "1"
+
+# Enable/Disable USB autosuspend (seems broken on current (6.x) kernels)
+# 0 = disabled
+# 1 = enabled
+setenv usb_autosuspend "0"
+
+# Find the bootdev
+# Same order is followed as in factory U-BOOT, when searching for this script,
+# so same device should be found.
+# We can't use `test -z` due to the bug: https://lists.denx.de/pipermail/u-boot/2005-August/011447.html
+env set bootdev ""
+if test -n "${bootdev}"; test $? != 0; then if fatload usb 0 11000000 s805_autoscript; then env set bootdev "usb 0"; fi; fi;
+if test -n "${bootdev}"; test $? != 0; then if fatload usb 1 11000000 s805_autoscript; then env set bootdev "usb 1"; fi; fi;
+if test -n "${bootdev}"; test $? != 0; then if fatload usb 2 11000000 s805_autoscript; then env set bootdev "usb 2"; fi; fi;
+if test -n "${bootdev}"; test $? != 0; then if fatload usb 3 11000000 s805_autoscript; then env set bootdev "usb 3"; fi; fi;
+if test -n "${bootdev}"; test $? != 0; then if fatload mmc 0 11000000 s805_autoscript; then env set bootdev "mmc 0"; fi; fi;
+
+fatload ${bootdev} 0x20800000 /armbianEnv.txt && env import -t 0x20800000 ${filesize}
+
+###########################################
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyAML0,115200n8 ${consoleargs}"; fi
+setenv consoleargs "${consoleargs} no_console_suspend consoleblank=0"
+if test "${usb_autosuspend}" = "0"; then setenv extraargs "usbcore.autosuspend=-1"; fi
+
+# Boot Arguments
+setenv bootargs "root=${rootdev} rootwait rw ${consoleargs} rootfstype=${rootfstype} loglevel=${verbosity} ${extraargs}"
+
+# Booting
+fatload "${bootdev}" 0x20800000 /uImage
+fatload "${bootdev}" 0x22000000 /uInitrd
+fatload "${bootdev}" 0x21800000 "${dtb_file}"
+
+bootm 0x20800000 0x22000000 0x21800000