Revert "Add Rockchip u-boot "binman" BOOT_SCENARIO (#7505)"

This reverts commit fc54623c4a.

.github/CODEOWNERS

@@ -25,7 +25,7 @@ config/boards/avaota-a1.csc		@chainsx
 config/boards/ayn-odin2.eos		@FantasyGmm
 config/boards/bananapi.conf		@DylanHP @janprunk
 config/boards/bananapicm4io.conf		@pyavitz
-config/boards/bananapim2pro.conf		@bretmlw
+config/boards/bananapim2pro.conf		@igorpecovnik
 config/boards/bananapim2s.conf		@jeanrhum @pyavitz
 config/boards/bananapim2zero.csc		@mhawkins-consultant
 config/boards/bananapim3.csc		@AaronNGray
@@ -166,7 +166,7 @@ config/kernel/linux-odroidxu4-*.config		@joekhoobyar
 config/kernel/linux-phytium-embedded-*.config		@chainsx
 config/kernel/linux-rk35xx-*.config		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 config/kernel/linux-rockchip-*.config		@paolosabatino
-config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
+config/kernel/linux-rockchip-rk3588-*.config		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
 config/kernel/linux-rockchip64-*.config		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 config/kernel/linux-sm8250-*.config		@FantasyGmm @amazingfate
 config/kernel/linux-sun55iw3-syterkit-*.config		@chainsx
@@ -190,7 +190,7 @@ patch/kernel/odroidxu4-*/		@joekhoobyar
 patch/kernel/phytium-embedded-*/		@chainsx
 patch/kernel/rk35xx-vendor-*/		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
 patch/kernel/rockchip-*/		@paolosabatino
-patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
+patch/kernel/rockchip-rk3588-*/		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
 patch/kernel/rockchip64-*/		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 patch/kernel/sm8250-*/		@FantasyGmm @amazingfate
 patch/kernel/sm8550-*/		@FantasyGmm
@@ -207,7 +207,7 @@ sources/families/mvebu.conf		@Heisath
 sources/families/odroidxu4.conf		@joekhoobyar
 sources/families/phytium-embedded.conf		@chainsx
 sources/families/rk35xx.conf		@ColorfulRhino @HeyMeco @SeeleVolleri @SuperKali @Tonymac32 @ZazaBR @alexl83 @amazingfate @catalinii @chainsx @efectn @fridtjof @ginkage @hoochiwetech @krachlatte @lanefu @linhz0hz @mahdichi @mattx433 @monkaBlyat @prahal @rpardini @schwar3kat @sputnik2019 @vamzii
-sources/families/rockchip-rk3588.conf		@ColorfulRhino @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @lanefu @linhz0hz @rpardini @schwar3kat
+sources/families/rockchip-rk3588.conf		@ColorfulRhino @HeyMeco @SuperKali @Tonymac32 @alexl83 @amazingfate @andyshrk @efectn @fridtjof @lanefu @linhz0hz @rpardini @schwar3kat
 sources/families/rockchip.conf		@paolosabatino
 sources/families/rockchip64.conf		@150balbes @Manouchehri @TRSx80 @TheSnowfield @Tonymac32 @ZazaBR @ahoneybun @amazingfate @andyshrk @brentr @catalinii @clee @hqnicolas @igorpecovnik @joekhoobyar @krachlatte @paolosabatino @prahal @rpardini @sicXnull @tdleiyao @utlark @vamzii
 sources/families/sm8250.conf		@FantasyGmm @amazingfate

config/boards/aml-s9xx-box.tvb

@@ -31,7 +31,7 @@ function post_family_tweaks_bsp__config_aml-s9xx-box_bsp() {
 	run_host_command_logged chmod -v 644 "${destination}"/root/fstab.template
 
 	display_alert "${BOARD}" "Removing armbian-install" "info"
-	run_host_command_logged rm -v "${destination}"/usr/sbin/armbian-install
+	run_host_command_logged rm -v "${destination}"/usr/bin/armbian-install
 
 	display_alert "${BOARD}" "Adding bsp-cli preinst logic" "info"
 	# Inline function! So this function is automatically hashed when this hook is hashed.

config/boards/bananapim2pro.conf

@@ -1,7 +1,7 @@
 # Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI Wifi
 BOARD_NAME="Banana Pi M2Pro"
 BOARDFAMILY="meson-sm1"
-BOARD_MAINTAINER="bretmlw"
+BOARD_MAINTAINER="igorpecovnik"
 BOOTCONFIG="bananapi-m2-pro_defconfig"
 BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m2-pro.dtb"
 KERNEL_TARGET="current,edge"

config/boards/bananapim3.csc

@@ -6,3 +6,6 @@ BOOTCONFIG="Sinovoip_BPI_M3_defconfig"
 OVERLAY_PREFIX="sun8i-a83t"
 KERNEL_TARGET="legacy,current,edge"
 KERNEL_TEST_TARGET="current"
+
+BOOTBRANCH="tag:v2024.01"
+BOOTPATCHDIR="u-boot-sunxi/board_${BOARD}"

config/boards/rock-5b-plus.conf

@@ -3,7 +3,7 @@ BOARD_NAME="Rock 5B Plus"
 BOARDFAMILY="rockchip-rk3588"
 BOARD_MAINTAINER="HeyMeco fridtjof"
 BOOTCONFIG="rock-5b-plus-rk3588_defconfig"
-KERNEL_TARGET="vendor"
+KERNEL_TARGET="edge,vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3588-radxa-rock-5b+.dtb"
@@ -25,3 +25,42 @@ function post_family_tweaks__rock5b_naming_audios() {
 
 	return 0
 }
+
+# Mainline u-boot tree
+# see rock-5b.conf and https://github.com/armbian/build/pull/7135
+function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
+	display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"
+
+	# temporary override until DT in armbian/rockchip-linux is renamed
+	declare -g BOOT_FDT_FILE="rockchip/rk3588-rock-5b-plus.dtb"
+
+	declare -g BOOTCONFIG="rock5b-rk3588_defconfig"                       # override the default for the board/family
+	declare -g BOOTDELAY=1                                                # Wait for UART interrupt to enter UMS/RockUSB mode etc
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"          # We ❤️ Mainline tree
+	declare -g BOOTBRANCH="tag:v2024.10"                                  #
+	declare -g BOOTPATCHDIR="v2024.10"                                    # empty; defconfig changes are done in hook below
+	declare -g BOOTDIR="u-boot-${BOARD}"                                  # do not share u-boot directory
+	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
+	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already
+
+	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
+	function write_uboot_platform() {
+		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
+	}
+
+	function write_uboot_platform_mtd() {
+		flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
+	}
+}
+
+function post_config_uboot_target__extra_configs_for_rock5b_mainline_environment_in_spi() {
+	[[ "${BRANCH}" != "edge" ]] && return 0
+
+	display_alert "$BOARD" "u-boot configs for ${BOOTBRANCH} u-boot config BRANCH=${BRANCH}" "info"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_NOWHERE "n"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_IS_IN_SPI_FLASH "y"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_SECT_SIZE_AUTO "y"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_OVERWRITE "y"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_SIZE "0x20000"
+	run_host_command_logged scripts/config --set-val CONFIG_ENV_OFFSET "0xc00000"
+}

config/boards/thinkpad-x13s.wip

@@ -30,7 +30,7 @@ declare -g BOARD_FIRMWARE_INSTALL="-full"
 
 function post_family_config_branch_sc8280xp__jhovolds_wip_kernel() {
 	declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12-rc4' # @TODO: this is down to 27 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.12' # @TODO: this is down to 27 patches, from hundreds back in the day. Considering merging this with default arm64 uefi kernel
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"

config/bootscripts/boot-sun50i-next.cmd

@@ -13,6 +13,15 @@ setenv console "both"
 setenv docker_optimizations "on"
 setenv bootlogo "false"
 
+# Remember the default u-boot fdtfile
+setenv deffdt_file ${fdtfile}
+
+# Remember the default u-boot fdtdir
+setenv deffdt_dir "${prefix}dtb"
+if test "$fdtdir" = ""; then setenv fdtdir "${deffdt_dir}";fi
+
+setenv vendor "allwinner"
+
 # Print boot source
 itest.b *0x10028 == 0x00 && echo "U-boot loaded from SD"
 itest.b *0x10028 == 0x02 && echo "U-boot loaded from eMMC or secondary SD"
@@ -25,6 +34,37 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
 	env import -t ${load_addr} ${filesize}
 fi
 
+# In this shell, we can only check the existence of the file.
+# Make a check of reasonable ways to find the dtb file.
+# Set the true value of the paths.
+if test -e ${devtype} ${devnum} "${fdtdir}/${fdtfile}"; then
+	:
+else
+	echo "File ${fdtdir}/${fdtfile} does not exists"
+	if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${fdtfile}"; then
+		setenv fdtdir "${deffdt_dir}/${vendor}"
+	else
+		echo "File ${deffdt_dir}/${vendor}/${fdtfile} does not exists"
+		if test -e ${devtype} ${devnum} "${deffdt_dir}/${fdtfile}"; then
+			setenv fdtdir "${deffdt_dir}"
+		else
+			echo "File ${deffdt_dir}/${fdtfile} does not exists"
+			if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${deffdt_file}"; then
+				setenv fdtdir "${deffdt_dir}/${vendor}"
+				setenv fdtfile "${deffdt_file}"
+			else
+				echo "File ${deffdt_dir}/${vendor}/${deffdt_file} does not exists"
+				if test -e ${devtype} ${devnum} "${deffdt_dir}/${deffdt_file}"; then
+					setenv fdtdir "${deffdt_dir}"
+					setenv fdtfile "${deffdt_file}"
+				else
+					echo "File ${deffdt_dir}/${deffdt_file} does not exists"
+				fi
+			fi
+		fi
+	fi
+fi
+
 if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
 if test "${bootlogo}" = "true"; then
@@ -41,11 +81,11 @@ setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs
 
 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory"; fi
 
-load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
 fdt addr ${fdt_addr_r}
 fdt resize 65536
 for overlay_file in ${overlays}; do
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/allwinner/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+	if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 		fdt apply ${load_addr} || setenv overlay_error "true"
 	fi
@@ -58,9 +98,9 @@ for overlay_file in ${user_overlays}; do
 done
 if test "${overlay_error}" = "true"; then
 	echo "Error applying DT overlays, restoring original DT"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+	load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
 else
-	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/allwinner/overlay/${overlay_prefix}-fixup.scr; then
+	if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr; then
 		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 		source ${load_addr}
 	fi

config/bootscripts/boot-sunxi.cmd

@@ -17,6 +17,15 @@ setenv devnum "0"
 setenv rootdev "/dev/mmcblk${devnum}p1"
 setenv earlycon "off"
 
+# Remember the default u-boot fdtfile
+setenv deffdt_file ${fdtfile}
+
+# Remember the default u-boot fdtdir
+setenv deffdt_dir "${prefix}dtb"
+if test "$fdtdir" = ""; then setenv fdtdir "${deffdt_dir}";fi
+
+setenv vendor "allwinner"
+
 # Print boot source
 itest.b *0x28 == 0x00 && echo "U-boot loaded from SD"
 itest.b *0x28 == 0x01 && echo "U-boot loaded from NAND"
@@ -31,13 +40,42 @@ if test "${devtype}" = "mmc"; then
 	setenv rootdev "/dev/mmcblk${mmc_bootdev}p1"
 fi
 
-echo "Boot script loaded from ${devtype}"
-
 if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
 	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
 	env import -t ${load_addr} ${filesize}
 fi
 
+# In this shell, we can only check the existence of the file.
+# Make a check of reasonable ways to find the dtb file.
+# Set the true value of the paths.
+if test -e ${devtype} ${devnum} "${fdtdir}/${fdtfile}"; then
+	:
+else
+	echo "File ${fdtdir}/${fdtfile} does not exists"
+	if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${fdtfile}"; then
+		setenv fdtdir "${deffdt_dir}/${vendor}"
+	else
+		echo "File ${deffdt_dir}/${vendor}/${fdtfile} does not exists"
+		if test -e ${devtype} ${devnum} "${deffdt_dir}/${fdtfile}"; then
+			setenv fdtdir "${deffdt_dir}"
+		else
+			echo "File ${deffdt_dir}/${fdtfile} does not exists"
+			if test -e ${devtype} ${devnum} "${deffdt_dir}/${vendor}/${deffdt_file}"; then
+				setenv fdtdir "${deffdt_dir}/${vendor}"
+				setenv fdtfile "${deffdt_file}"
+			else
+				echo "File ${deffdt_dir}/${vendor}/${deffdt_file} does not exists"
+				if test -e ${devtype} ${devnum} "${deffdt_dir}/${deffdt_file}"; then
+					setenv fdtdir "${deffdt_dir}"
+					setenv fdtfile "${deffdt_file}"
+				else
+					echo "File ${deffdt_dir}/${deffdt_file} does not exists"
+				fi
+			fi
+		fi
+	fi
+fi
+
 if test "${console}" = "display"; then setenv consoleargs "console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
 if test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
@@ -50,7 +88,10 @@ fi
 
 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} hdmi.audio=EDID:0 disp.screen0_output_mode=${disp_mode} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} ubootsource=${devtype} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
 
-if test "${disp_mem_reserves}" = "off"; then setenv bootargs "${bootargs} sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16"; fi
+if test "${disp_mem_reserves}" = "off"; then
+	setenv bootargs "${bootargs} sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_fb_mem_reserve=16"
+fi
+
 if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory"; fi
 
 load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
@@ -58,11 +99,13 @@ load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}zImage
 
 if test -e ${devtype} ${devnum} "${prefix}.next"; then
 	echo "Found mainline kernel configuration"
-	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+	if load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}; then
+		echo "Load fdt: ${fdtdir}/${fdtfile}"
+	fi
 	fdt addr ${fdt_addr_r}
 	fdt resize 65536
 	for overlay_file in ${overlays}; do
-		if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+		if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
 			echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
 			fdt apply ${load_addr} || setenv overlay_error "true"
 		fi
@@ -75,9 +118,9 @@ if test -e ${devtype} ${devnum} "${prefix}.next"; then
 	done
 	if test "${overlay_error}" = "true"; then
 		echo "Error applying DT overlays, restoring original DT"
-		load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+		load ${devtype} ${devnum} ${fdt_addr_r} ${fdtdir}/${fdtfile}
 	else
-		if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/overlay/${overlay_prefix}-fixup.scr; then
+		if load ${devtype} ${devnum} ${load_addr} ${fdtdir}/overlay/${overlay_prefix}-fixup.scr; then
 			echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
 			source ${load_addr}
 		fi

config/sources/families/include/meson64_common.inc

@@ -46,7 +46,7 @@ case $BRANCH in
 		declare -g KERNEL_MAJOR_MINOR="6.6"
 		;;
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.11"
+		declare -g KERNEL_MAJOR_MINOR="6.12"
 		;;
 
 esac

config/sources/families/include/rockchip64_common.inc

@@ -216,8 +216,22 @@ uboot_custom_postprocess() {
 		[[ -z ${SPL_BIN_PATH} ]] && exit_with_error "DDR_BLOB not defined for scenario ${BOOT_SCENARIO}"
 		[[ ! -f "${SPL_BIN_PATH}" ]] && exit_with_error "DDR_BLOB ${SPL_BIN_PATH} does not exist for scenario ${BOOT_SCENARIO}"
 
-		display_alert "mkimage for '${BOOT_SOC}' for scenario ${BOOT_SCENARIO}" "SPL_BIN_PATH: ${SPL_BIN_PATH}" "debug"
-		run_host_command_logged tools/mkimage -n "${BOOT_SOC_MKIMAGE}" -T rksd -d "${SPL_BIN_PATH}:spl/u-boot-spl.bin" idbloader.img
+		if [[ $BOOT_SOC == "rk3576" ]]; then
+			display_alert "boot_merger for '${BOOT_SOC}' for scenario ${BOOT_SCENARIO}" "SPL_BIN_PATH: ${SPL_BIN_PATH}" "debug"
+			RKBOOT_INI_FILE=rk3576.ini
+			cp $RKBIN_DIR/rk35/RK3576MINIALL.ini $RKBOOT_INI_FILE
+			sed -i "s|FlashBoost=.*$|FlashBoost=${RKBIN_DIR}/rk35/rk3576_boost_v1.02.bin|g" $RKBOOT_INI_FILE
+			sed -i "s|Path1=.*rk3576_ddr.*$|Path1=${SPL_BIN_PATH}|g" $RKBOOT_INI_FILE
+			sed -i "s|Path1=.*rk3576_usbplug.*$|Path1=${RKBIN_DIR}/rk35/rk3576_usbplug_v1.03.bin|g" $RKBOOT_INI_FILE
+			sed -i "s|FlashData=.*$|FlashData=${SPL_BIN_PATH}|g" $RKBOOT_INI_FILE
+			sed -i "s|FlashBoot=.*$|FlashBoot=./spl/u-boot-spl.bin|g" $RKBOOT_INI_FILE
+			sed -i "s|IDB_PATH=.*$|IDB_PATH=idbloader.img|g" $RKBOOT_INI_FILE
+			run_host_x86_binary_logged $RKBIN_DIR/tools/boot_merger $RKBOOT_INI_FILE
+			rm -f $RKBOOT_INI_FILE
+		else
+			display_alert "mkimage for '${BOOT_SOC}' for scenario ${BOOT_SCENARIO}" "SPL_BIN_PATH: ${SPL_BIN_PATH}" "debug"
+			run_host_command_logged tools/mkimage -n "${BOOT_SOC_MKIMAGE}" -T rksd -d "${SPL_BIN_PATH}:spl/u-boot-spl.bin" idbloader.img
+		fi
 
 	elif [[ $BOOT_SCENARIO == "only-blobs" ]]; then
 

config/sources/families/include/sunxi64_common.inc

@@ -31,12 +31,12 @@ case $BRANCH in
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.6.60"
+		declare -g KERNELBRANCH="tag:v6.6.62"
 		;;
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.11.7"
+		declare -g KERNELBRANCH="tag:v6.11.9"
 		;;
 esac
 

config/sources/families/include/sunxi_common.inc

@@ -32,12 +32,12 @@ case $BRANCH in
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.6.60"
+		declare -g KERNELBRANCH="tag:v6.6.62"
 		;;
 
 	edge)
 		declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.11.7"
+		declare -g KERNELBRANCH="tag:v6.11.9"
 		;;
 esac
 

config/sources/mainline-kernel.conf.sh

@@ -7,8 +7,8 @@
 # Shared versioning logic for Armbian mainline kernels.
 function mainline_kernel_decide_version__upstream_release_candidate_number() {
 	[[ -n "${KERNELBRANCH}" ]] && return 0           # if already set, don't touch it; that way other hooks can run in any order
-	if [[ "${KERNEL_MAJOR_MINOR}" == "6.12" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
-		declare -g KERNELBRANCH="tag:v6.12-rc7"
+	if [[ "${KERNEL_MAJOR_MINOR}" == "6.13" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
+		declare -g KERNELBRANCH="tag:v6.13-rc1"
 		display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
 	fi
 }

lib/functions/compilation/packages/armbian-zsh-deb.sh

@@ -78,6 +78,9 @@ compile_armbian-zsh() {
 	# define default plugins
 	sed -i 's/^plugins=.*/plugins=(evalcache git git-extras debian tmux screen history extract colorize web-search docker)/' "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc
 
+	# add collection of Armbian BASH aliases also to ZSH. They are compatible
+	cat "${SRC}"/packages/bsp/common/etc/skel/.bash_aliases >> "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc
+
 	chmod 755 "${tmp_dir}/${armbian_zsh_dir}"/DEBIAN/postinst
 
 	dpkg_deb_build "${tmp_dir}/${armbian_zsh_dir}" "armbian-zsh"

lib/functions/general/apt-utils.sh

@@ -9,7 +9,6 @@
 function apt_find_upstream_package_version_and_download_url() {
 	declare sought_package_name="${1}"
 
-	declare -a package_info_download_urls=()
 	declare first_letter_of_sought_package_name="${sought_package_name:0:1}"
 	declare mirror_with_slash="undetermined/"
 
@@ -17,15 +16,15 @@ function apt_find_upstream_package_version_and_download_url() {
 		Ubuntu)
 			# Only LTS releases have an "-updates" repo that is worth looking into
 			if [[ "${RELEASE}" == "focal" || "${RELEASE}" == "jammy" ]]; then # @TODO: release info information, is_ubuntu_release_lts() or similar
-				package_info_download_urls+=("https://packages.ubuntu.com/${RELEASE}-updates/${ARCH}/${sought_package_name}/download")
+				package_download_release=${RELEASE}-updates
 			else
-				package_info_download_urls+=("https://packages.ubuntu.com/${RELEASE}/${ARCH}/${sought_package_name}/download")
+				package_download_release=${RELEASE}
 			fi
 			mirror_with_slash="${UBUNTU_MIRROR}"
 			;;
 
 		Debian)
-			package_info_download_urls+=("https://packages.debian.org/${RELEASE}/${ARCH}/${sought_package_name}/download")
+			package_download_release=${RELEASE}
 			mirror_with_slash="${DEBIAN_MIRROR}"
 			;;
 
@@ -41,35 +40,29 @@ function apt_find_upstream_package_version_and_download_url() {
 
 	declare base_down_url="http://${mirror_with_slash}pool/main/${first_letter_of_sought_package_name}/${sought_package_name}"
 
-	declare index package_info_download_url
-	# loop over the package_info_download_urls with index and value
-	for index in "${!package_info_download_urls[@]}"; do
-		package_info_download_url="${package_info_download_urls[$index]}"
-		display_alert "Testing URL" "${package_info_download_url}" "debug"
-
-		declare package_info_download_url_file
-		package_info_download_url_file="$(mktemp)"
-		curl --silent --show-error --max-time 10 "${package_info_download_url}" > "${package_info_download_url_file}" || true # don't fail
-		declare package_info_download_url_file_package_name                                                                   # grep the file for the package name. parse "<kbd>name</kbd>"
-		package_info_download_url_file_package_name="$(grep -oP '(?<=<kbd>)[^<]+' "${package_info_download_url_file}" | grep "^${sought_package_name}_" | head -n 1)"
-		rm -f "${package_info_download_url_file}"
-
-		display_alert "Package name parsed" "${package_info_download_url_file_package_name}" "debug"
-		if [[ "${package_info_download_url_file_package_name}" == "${sought_package_name}_"* ]]; then
-			found_package_filename="${package_info_download_url_file_package_name}"
-			found_package_down_url="${base_down_url}/${found_package_filename}"
-			display_alert "Found package filename" "${found_package_filename} in url ${package_info_download_url}" "debug"
-			break
-		fi
-	done
+	# get json with latest pacakge info generated by GHA
+	case "${GITHUB_MIRROR}" in
+		"ghproxy")
+			package_info_download_url="https://ghp.ci/https://raw.githubusercontent.com/armbian/armbian.github.io/refs/heads/data/data/${sought_package_name}.json"
+			;;
+		*)
+			package_info_download_url="https://github.armbian.com/${sought_package_name}.json"
+			;;
+	esac
+	package_info_download_url_file="$(mktemp)"
+	curl --silent --show-error --max-time 10 $package_info_download_url -o $package_info_download_url_file
+	found_package_filename=$(jq -r .[\"${package_download_release}\"].${ARCH} $package_info_download_url_file)
 
 	if [[ "${found_package_filename}" == "${sought_package_name}_"* ]]; then
 		display_alert "Found upstream base-files package filename" "${found_package_filename}" "info"
 	else
-		display_alert "Could not find package filename for '${sought_package_name}' in '${package_info_download_urls[*]}'" "looking for ${sought_package_name}" "warn"
+		display_alert "Could not find package filename for '${sought_package_name}' in distro repo" "looking for ${sought_package_name}, found_package_filename is ${found_package_filename}" "warn"
 		return 1
 	fi
 
+	found_package_down_url="${base_down_url}/${found_package_filename}"
+	display_alert "Found package filename" "${found_package_filename} in url ${found_package_down_url}" "debug"
+
 	# Now we have the package name, lets parse out the version.
 	found_package_version="$(echo "${found_package_filename}" | grep -oP '(?<=_)[^_]+(?=_)')"
 	display_alert "Found base-files upstream package version" "${found_package_version}" "info"

lib/functions/rootfs/distro-agnostic.sh

@@ -99,16 +99,14 @@ function install_distribution_agnostic() {
 	echo -e "${VENDOR} ${IMAGE_VERSION:-"${REVISION}"} ${RELEASE^} \\l \n" > "${SDCARD}"/etc/issue
 	echo "${VENDOR} ${IMAGE_VERSION:-"${REVISION}"} ${RELEASE^}" > "${SDCARD}"/etc/issue.net
 
-	# PRETTY_NAME changing in os-release is now done in armbian-base-files directly.
+	# Copy SKEL bashrc and profile to root user
+	cp "${SDCARD}"/etc/skel/.bashrc "${SDCARD}"/root/
+	cp "${SDCARD}"/etc/skel/.profile "${SDCARD}"/root/
 
-	# enable few bash aliases enabled in Ubuntu by default to make it even
-	sed "s/#alias ll='ls -l'/alias ll='ls -l'/" -i "${SDCARD}"/etc/skel/.bashrc
-	sed "s/#alias la='ls -A'/alias la='ls -A'/" -i "${SDCARD}"/etc/skel/.bashrc
-	sed "s/#alias l='ls -CF'/alias l='ls -CF'/" -i "${SDCARD}"/etc/skel/.bashrc
-	# root user is already there. Copy bashrc there as well
-	cp "${SDCARD}"/etc/skel/.bashrc "${SDCARD}"/root
+	# Copy systemwide alieases to root user too
+	cp "${SRC}"/packages/bsp/common/etc/skel/.bash_aliases "${SDCARD}"/root/
 
-	# display welcome message at first root login @TODO: what reads this?
+	# display welcome message at first root login which is ready by /usr/sbin/armbian/armbian-firstlogin
 	touch "${SDCARD}"/root/.not_logged_in_yet
 
 	if [[ ${DESKTOP_AUTOLOGIN} == yes ]]; then

packages/bsp/common/etc/skel/.bash_aliases

@@ -0,0 +1,6 @@
+# BASH or ZSH shell alieases
+alias ll='ls -l'
+alias la='ls -A'
+alias l='ls -CF'
+alias kernel="uname -r | sed 's/[1-9]\+[0-9]*\.[0-9]\+\.[0-9]\+-//' | sed 's/[1-9]\+[0-9]*\.[0-9]*\-rc[0-9]\+-//'"
+alias showip='ip -4 addr show scope global | grep inet | awk "{print $2}" | cut -d"/" -f1 | sed "s/    inet //g" | paste -s -d, -'

packages/bsp/common/etc/update-motd.d/41-commands

@@ -14,6 +14,9 @@ MOTD_DISABLE=""
 
 [[ -f /etc/default/armbian-motd ]] && . /etc/default/armbian-motd
 
+# read upgrade count to show upgrade command
+[[ -f /var/cache/apt/archives/updates.number ]] && . /var/cache/apt/archives/updates.number
+
 for f in $MOTD_DISABLE; do
 	[[ $f == $THIS_SCRIPT ]] && exit 0
 done
@@ -22,6 +25,7 @@ done
 # condition can be fairly complex
 list=(
     "Configuration","","armbian-config","true"
+    "Upgrade","","armbian-upgrade","[[ \"${NUM_UPDATES}\" -gt 0 ]]"
     "Monitoring","","htop","true"
 )
 

packages/bsp/common/usr/bin/armbian-install

@@ -20,6 +20,9 @@
 #   $4 = :space: separated list of all MTD device names
 #        Note: MTD char device names are passed in format device_name:partition_label - e.g.: mtd0:SPL
 
+trap "exit" INT TERM
+[[ $EUID != 0 ]] && exec sudo "$0" "$@"
+
 [[ -f /usr/lib/u-boot/platform_install.sh ]] && source /usr/lib/u-boot/platform_install.sh
 
 # ORIGINAL_SCRIPT_NAME: Must be either armbian-install or nand-sata-install

packages/bsp/common/usr/bin/armbian-upgrade

@@ -0,0 +1,8 @@
+#!/bin/bash
+trap "exit" INT TERM
+[[ $EUID != 0 ]] && exec sudo "$0" "$@"
+apt update
+apt -y upgrade
+apt clean
+apt -y autoremove
+exit 0

packages/bsp/common/usr/lib/armbian/armbian-apt-updates

@@ -36,6 +36,9 @@ fi
 myfile="/var/cache/apt/archives/updates.number"
 myfiles="/var/cache/apt/archives/updates.list"
 
+# create folder as it doesn't exists at start to prevent erroring
+mkdir -p "/var/cache/apt/archives/"
+
 # update procedure
 DISTRO=$(lsb_release -c | cut -d ":" -f 2 |  tr -d '[:space:]') && DISTRO=${DISTRO,,}
 

patch/kernel/archive/meson64-6.12/board-bananapi-cm4-cm4io.patch

@@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
  		};
  	};
  
-@@ -116,6 +117,10 @@ codec {
+@@ -120,6 +121,10 @@ codec {
  	};
  };
  

patch/kernel/archive/meson64-6.12/board-bananapim5-002-add-wifi-bt-support.patch

@@ -37,7 +37,7 @@ index 111111111111..222222222222 100644
  	sound {
  		compatible = "amlogic,axg-sound-card";
  		model = "BPI-M5";
-@@ -149,7 +163,6 @@ &acodec {
+@@ -153,7 +167,6 @@ &acodec {
  	status = "okay";
  };
  
@@ -45,7 +45,7 @@ index 111111111111..222222222222 100644
  &clkc_audio {
  	status = "okay";
  };
-@@ -172,6 +185,42 @@ &frddr_c {
+@@ -176,6 +189,42 @@ &frddr_c {
  	status = "okay";
  };
  
@@ -88,7 +88,7 @@ index 111111111111..222222222222 100644
  &tdmif_b {
  	status = "okay";
  };
-@@ -219,3 +268,18 @@ &toddr_b {
+@@ -223,3 +272,18 @@ &toddr_b {
  &toddr_c {
  	status = "okay";
  };

patch/kernel/archive/meson64-6.12/board-bananapism1-add-uart_A-and-AO_B.patch

@@ -47,7 +47,7 @@ index 111111111111..222222222222 100644
  	sound {
  		compatible = "amlogic,axg-sound-card";
  		model = "BPI-M2-PRO";
-@@ -95,3 +99,9 @@ &tdmout_b {
+@@ -99,3 +103,9 @@ &tdmout_b {
  &tohdmitx {
  	status = "okay";
  };

patch/kernel/archive/meson64-6.12/board-khadas-vim3-fix-missing-i2c3-nod.patch

@@ -18,7 +18,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
-@@ -332,6 +332,13 @@ hdmi_tx_tmds_out: endpoint {
+@@ -336,6 +336,13 @@ hdmi_tx_tmds_out: endpoint {
  	};
  };
  

patch/kernel/archive/meson64-6.12/board-nanopi-k2-enable-emmc.patch

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/b
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-@@ -358,7 +358,7 @@ &sd_emmc_b {
+@@ -362,7 +362,7 @@ &sd_emmc_b {
  
  /* eMMC */
  &sd_emmc_c {
@@ -21,7 +21,7 @@ index 111111111111..222222222222 100644
  	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
  	pinctrl-1 = <&emmc_clk_gate_pins>;
  	pinctrl-names = "default", "clk-gate";
-@@ -368,8 +368,6 @@ &sd_emmc_c {
+@@ -372,8 +372,6 @@ &sd_emmc_c {
  	non-removable;
  	disable-wp;
  	cap-mmc-highspeed;

patch/kernel/archive/meson64-6.12/board-odroidc2-add-uartA-uartC.patch

@@ -26,7 +26,7 @@ index 111111111111..222222222222 100644
  		ethernet0 = &ethmac;
  	};
  
-@@ -383,6 +385,18 @@ &uart_AO {
+@@ -387,6 +389,18 @@ &uart_AO {
  	pinctrl-names = "default";
  };
  

patch/kernel/archive/meson64-6.12/board-odroidc2-enable-scpi-dvfs.patch

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/bo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
-@@ -360,7 +360,8 @@ &saradc {
+@@ -364,7 +364,8 @@ &saradc {
  };
  
  &scpi_clocks {

patch/kernel/archive/meson64-6.12/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch

@@ -41,7 +41,7 @@ index 111111111111..222222222222 100644
  	ao_5v: regulator-ao-5v {
  		compatible = "regulator-fixed";
  		regulator-name = "AO_5V";
-@@ -202,6 +210,18 @@ wifi32k: wifi32k {
+@@ -206,6 +214,18 @@ wifi32k: wifi32k {
  	};
  };
  
@@ -60,7 +60,7 @@ index 111111111111..222222222222 100644
  &arb {
  	status = "okay";
  };
-@@ -289,6 +309,26 @@ &ir {
+@@ -293,6 +313,26 @@ &ir {
  	pinctrl-names = "default";
  };
  
@@ -87,7 +87,7 @@ index 111111111111..222222222222 100644
  &pwm_AO_cd {
  	pinctrl-0 = <&pwm_ao_d_e_pins>;
  	pinctrl-names = "default";
-@@ -413,3 +453,11 @@ &uart_AO {
+@@ -417,3 +457,11 @@ &uart_AO {
  &usb {
  	status = "okay";
  };

patch/kernel/archive/meson64-6.12/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch

@@ -15,7 +15,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-@@ -361,7 +361,7 @@ &sd_emmc_a {
+@@ -365,7 +365,7 @@ &sd_emmc_a {
  
  	bus-width = <4>;
  	cap-sd-highspeed;

patch/kernel/archive/meson64-6.12/board-t95z-add-rc-remote-keymap.patch

@@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
 index 111111111111..222222222222 100644
 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -1431,6 +1431,8 @@ patternProperties:
+@@ -1435,6 +1435,8 @@ patternProperties:
      description: Sundance DSP Inc.
    "^sunplus,.*":
      description: Sunplus Technology Co., Ltd.

patch/kernel/archive/meson64-6.12/driver-power-meson64-reset.patch

@@ -13,7 +13,7 @@ diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/power/reset/Kconfig
 +++ b/drivers/power/reset/Kconfig
-@@ -148,6 +148,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
+@@ -158,6 +158,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
  	help
  	  This driver supports Power off for Odroid Go Ultra device.
  
@@ -31,7 +31,7 @@ diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/power/reset/Makefile
 +++ b/drivers/power/reset/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
+@@ -15,6 +15,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
  obj-$(CONFIG_POWER_RESET_LINKSTATION) += linkstation-poweroff.o
  obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
  obj-$(CONFIG_POWER_RESET_MT6323) += mt6323-poweroff.o

patch/kernel/archive/meson64-6.12/drv-spi-spidev-remove-warnings.patch

@@ -12,7 +12,7 @@ diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
 index 111111111111..222222222222 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -700,6 +700,7 @@ static const struct class spidev_class = {
+@@ -699,6 +699,7 @@ static const struct class spidev_class = {
  };
  
  static const struct spi_device_id spidev_spi_ids[] = {
@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
  	{ .name = "bh2228fv" },
  	{ .name = "dh2228fv" },
  	{ .name = "jg10309-01" },
-@@ -730,6 +731,7 @@ static int spidev_of_check(struct device *dev)
+@@ -729,6 +730,7 @@ static int spidev_of_check(struct device *dev)
  }
  
  static const struct of_device_id spidev_dt_ids[] = {

patch/kernel/archive/meson64-6.12/general-add-overlay-compilation-support.patch

@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <paolo.sabatino@gmail.com>
-Date: Sun, 2 Jun 2024 21:53:01 +0200
+Date: Wed, 2 Oct 2024 19:30:34 +0300
 Subject: compile .scr and install overlays in right path
 
 ---
  scripts/Makefile.dtbinst | 13 +++++++++-
- scripts/Makefile.lib     |  8 +++++-
+ scripts/Makefile.dtbs    |  8 +++++-
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
@@ -32,22 +32,19 @@ index 111111111111..222222222222 100644
  
  endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
  
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
 index 111111111111..222222222222 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -405,7 +405,7 @@ cmd_dtb_check = $(if $(dtb-check-enabled),; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u
- 
+--- a/scripts/Makefile.dtbs
++++ b/scripts/Makefile.dtbs
+@@ -122,17 +122,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
  quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
- cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
--	$(DTC) -o $@ -b 0 \
-+	$(DTC) -@ -o $@ -b 0 \
- 		$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
- 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
+       cmd_dtc = \
+ 	$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+-	$(DTC) -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
++	$(DTC) -@ -o $@ -b 0 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) \
+ 	       $(DTC_FLAGS) -d $(depfile).dtc.tmp $(dtc-tmp) ; \
  	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) \
-@@ -430,12 +430,18 @@ DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.json
- dtb-check-enabled = $(if $(filter %.dtb, $@),y)
- endif
+ 	$(cmd_dtb_check)
  
 +quiet_cmd_scr = MKIMAGE $@
 +cmd_scr = mkimage -C none -A $(ARCH) -T script -d $< $@
@@ -61,9 +58,9 @@ index 111111111111..222222222222 100644
 +$(obj)/%.scr: $(src)/%.scr-cmd FORCE
 +	$(call if_changed,scr)
 +
- dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
+ # targets
+ # ---------------------------------------------------------------------------
  
- # Bzip2
 -- 
 Armbian
 

patch/kernel/archive/meson64-6.12/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch

@@ -13,7 +13,7 @@ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/
 index 111111111111..222222222222 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-@@ -768,6 +768,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
+@@ -765,6 +765,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
  	else
  		hdmi->mc_clkdis |= HDMI_MC_CLKDIS_AUDCLK_DISABLE;
  	hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);

patch/kernel/archive/meson64-6.12/general-fix-Kodi-sysinfo-CPU-information.patch

@@ -16,7 +16,7 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
 index 111111111111..222222222222 100644
 --- a/arch/arm64/kernel/cpuinfo.c
 +++ b/arch/arm64/kernel/cpuinfo.c
-@@ -205,8 +205,7 @@ static int c_show(struct seq_file *m, void *v)
+@@ -206,8 +206,7 @@ static int c_show(struct seq_file *m, void *v)
  		 * "processor".  Give glibc what it expects.
  		 */
  		seq_printf(m, "processor\t: %d\n", i);

patch/kernel/archive/meson64-6.12/general-input-touchscreen-Add-D-WAV-Multitouch.patch

@@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
 index 111111111111..222222222222 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -1484,4 +1484,10 @@
+@@ -1474,4 +1474,10 @@
  #define USB_VENDOR_ID_SIGNOTEC			0x2133
  #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011	0x0018
  
@@ -45,7 +45,7 @@ diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconf
 index 111111111111..222222222222 100644
 --- a/drivers/input/touchscreen/Kconfig
 +++ b/drivers/input/touchscreen/Kconfig
-@@ -1430,4 +1430,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
+@@ -1388,4 +1388,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
  	  To compile this driver as a module, choose M here: the
  	  module will be called himax_hx83112b.
  
@@ -64,7 +64,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make
 index 111111111111..222222222222 100644
 --- a/drivers/input/touchscreen/Makefile
 +++ b/drivers/input/touchscreen/Makefile
-@@ -120,4 +120,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
+@@ -116,4 +116,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
  obj-$(CONFIG_TOUCHSCREEN_IQS5XX)	+= iqs5xx.o
  obj-$(CONFIG_TOUCHSCREEN_IQS7211)	+= iqs7211.o
  obj-$(CONFIG_TOUCHSCREEN_ZINITIX)	+= zinitix.o

patch/kernel/archive/meson64-6.12/general-meson-vdec-add-HEVC-decode-codec.patch

@@ -1546,7 +1546,7 @@ index 111111111111..222222222222 100644
  	}, {
  		.pixfmt = V4L2_PIX_FMT_H264,
  		.min_buffers = 2,
-@@ -114,6 +127,18 @@ static const struct amvdec_format vdec_formats_gxm[] = {
+@@ -152,6 +165,18 @@ static const struct amvdec_format vdec_formats_gxm[] = {
  		.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
  		.flags = V4L2_FMT_FLAG_COMPRESSED |
  			 V4L2_FMT_FLAG_DYN_RESOLUTION,
@@ -1565,7 +1565,7 @@ index 111111111111..222222222222 100644
  	}, {
  		.pixfmt = V4L2_PIX_FMT_H264,
  		.min_buffers = 2,
-@@ -165,6 +190,18 @@ static const struct amvdec_format vdec_formats_g12a[] = {
+@@ -203,6 +228,18 @@ static const struct amvdec_format vdec_formats_g12a[] = {
  		.flags = V4L2_FMT_FLAG_COMPRESSED |
  			 V4L2_FMT_FLAG_DYN_RESOLUTION,
  	}, {
@@ -1584,7 +1584,7 @@ index 111111111111..222222222222 100644
  		.pixfmt = V4L2_PIX_FMT_H264,
  		.min_buffers = 2,
  		.max_buffers = 24,
-@@ -214,6 +251,18 @@ static const struct amvdec_format vdec_formats_sm1[] = {
+@@ -252,6 +289,18 @@ static const struct amvdec_format vdec_formats_sm1[] = {
  		.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
  		.flags = V4L2_FMT_FLAG_COMPRESSED |
  			 V4L2_FMT_FLAG_DYN_RESOLUTION,

patch/kernel/archive/meson64-6.12/general-meson64-overlays.patch

@@ -12,9 +12,9 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 111111111111..222222222222 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -93,6 +93,9 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))
- 
- always-y			+= $(dtb-y)
+@@ -75,6 +75,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
+ userprogs += $(userprogs-always-y) $(userprogs-always-m)
+ always-y += $(userprogs-always-y) $(userprogs-always-m)
  
 +# Overlay targets
 +extra-y                                += $(dtbo-y) $(scr-y) $(dtbotxt-y)

patch/kernel/archive/meson64-6.12/general-soc-0001-soc-amlogic-meson-gx-socinfo-move-common-code-to-hea.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Viacheslav Bocharov <adeep@lexina.in>
-Date: Tue, 4 Jun 2024 17:18:08 +0300
+Date: Mon, 18 Nov 2024 15:36:06 +0300
 Subject: soc: amlogic: meson-gx-socinfo: move common code to header file
 
 Move common constants and inline functions from meson-gx-socinfo driver
@@ -8,16 +8,16 @@ to header file. Create new structures for store meson64 cpu_id and chip_id.
 
 Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
 ---
- drivers/soc/amlogic/meson-gx-socinfo-internal.h | 122 ++++++++
- drivers/soc/amlogic/meson-gx-socinfo.c          | 140 +---------
- 2 files changed, 137 insertions(+), 125 deletions(-)
+ drivers/soc/amlogic/meson-gx-socinfo-internal.h | 132 ++++++++
+ drivers/soc/amlogic/meson-gx-socinfo.c          | 150 +---------
+ 2 files changed, 147 insertions(+), 135 deletions(-)
 
 diff --git a/drivers/soc/amlogic/meson-gx-socinfo-internal.h b/drivers/soc/amlogic/meson-gx-socinfo-internal.h
 new file mode 100644
 index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/soc/amlogic/meson-gx-socinfo-internal.h
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,132 @@
 +/* SPDX-License-Identifier: GPL-2.0+ */
 +/*
 + * Copyright (c) 2017 BayLibre, SAS
@@ -76,6 +76,11 @@ index 000000000000..111111111111
 +	{ "G12B", 0x29 },
 +	{ "SM1", 0x2b },
 +	{ "A1", 0x2c },
++	{ "T7", 0x36 },
++	{ "S4", 0x37 },
++	{ "A5", 0x3c },
++	{ "C3", 0x3d },
++	{ "A4", 0x40 },
 +};
 +
 +static const struct meson_gx_package_id {
@@ -111,6 +116,11 @@ index 000000000000..111111111111
 +	{ "S905X3", 0x2b, 0x10, 0x3f },
 +	{ "S905D3", 0x2b, 0x30, 0x3f },
 +	{ "A113L", 0x2c, 0x0, 0xf8 },
++	{ "S805X2", 0x37, 0x2, 0xf },
++	{ "C308L", 0x3d, 0x1, 0xf },
++	{ "A311D2", 0x36, 0x1, 0xf },
++	{ "A113X2", 0x3c, 0x1, 0xf },
++	{ "A113L2", 0x40, 0x1, 0xf },
 +};
 +
 +static inline const char *socinfo_v1_to_package_id(union meson_cpu_id socinfo)
@@ -154,7 +164,7 @@ index 111111111111..222222222222 100644
   */
  
  #include <linux/io.h>
-@@ -12,120 +12,10 @@
+@@ -12,130 +12,10 @@
  #include <linux/platform_device.h>
  #include <linux/slab.h>
  #include <linux/sys_soc.h>
@@ -187,6 +197,11 @@ index 111111111111..222222222222 100644
 -	{ "G12B", 0x29 },
 -	{ "SM1", 0x2b },
 -	{ "A1", 0x2c },
+-	{ "T7", 0x36 },
+-	{ "S4", 0x37 },
+-	{ "A5", 0x3c },
+-	{ "C3", 0x3d },
+-	{ "A4", 0x40 },
 -};
 -
 -static const struct meson_gx_package_id {
@@ -222,6 +237,11 @@ index 111111111111..222222222222 100644
 -	{ "S905X3", 0x2b, 0x10, 0x3f },
 -	{ "S905D3", 0x2b, 0x30, 0x3f },
 -	{ "A113L", 0x2c, 0x0, 0xf8 },
+-	{ "S805X2", 0x37, 0x2, 0xf },
+-	{ "C308L", 0x3d, 0x1, 0xf },
+-	{ "A311D2", 0x36, 0x1, 0xf },
+-	{ "A113X2", 0x3c, 0x1, 0xf },
+-	{ "A113L2", 0x40, 0x1, 0xf },
 -};
 -
 -static inline unsigned int socinfo_to_major(u32 socinfo)
@@ -276,7 +296,7 @@ index 111111111111..222222222222 100644
  
  static int __init meson_gx_socinfo_init(void)
  {
-@@ -133,7 +23,7 @@ static int __init meson_gx_socinfo_init(void)
+@@ -143,7 +23,7 @@ static int __init meson_gx_socinfo_init(void)
  	struct soc_device *soc_dev;
  	struct device_node *np;
  	struct regmap *regmap;
@@ -285,7 +305,7 @@ index 111111111111..222222222222 100644
  	struct device *dev;
  	int ret;
  
-@@ -162,11 +52,11 @@ static int __init meson_gx_socinfo_init(void)
+@@ -172,11 +52,11 @@ static int __init meson_gx_socinfo_init(void)
  		return -ENODEV;
  	}
  
@@ -299,7 +319,7 @@ index 111111111111..222222222222 100644
  		pr_err("%s: invalid chipid value\n", __func__);
  		return -EINVAL;
  	}
-@@ -177,13 +67,13 @@ static int __init meson_gx_socinfo_init(void)
+@@ -187,13 +67,13 @@ static int __init meson_gx_socinfo_init(void)
  
  	soc_dev_attr->family = "Amlogic Meson";
  	soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%x:%x - %x:%x",
@@ -319,7 +339,7 @@ index 111111111111..222222222222 100644
  
  	soc_dev = soc_device_register(soc_dev_attr);
  	if (IS_ERR(soc_dev)) {
-@@ -196,10 +86,10 @@ static int __init meson_gx_socinfo_init(void)
+@@ -206,10 +86,10 @@ static int __init meson_gx_socinfo_init(void)
  
  	dev_info(dev, "Amlogic Meson %s Revision %x:%x (%x:%x) Detected\n",
  			soc_dev_attr->soc_id,

patch/kernel/archive/meson64-6.12/general-soc-0002-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Viacheslav Bocharov <adeep@lexina.in>
-Date: Wed, 21 Feb 2024 16:41:30 +0300
+Date: Mon, 18 Nov 2024 15:36:49 +0300
 Subject: soc: amlogic: meson-gx-socinfo-sm: Add Amlogic secure-monitor SoC
  Information driver
 
@@ -71,7 +71,7 @@ index 111111111111..222222222222 100644
 +	} v2;
 +	struct { // raw
 +		u32 version;
-+		u8 buf[12+sizeof(union meson_cpu_id)];
++		u8 buf[12 + sizeof(union meson_cpu_id)];
 +	} raw;
  };
  

patch/kernel/archive/meson64-6.12/general-soc-0003-dt-bindings-arm-amlogic-amlogic-meson-gx-ao-secure-a.patch

@@ -15,7 +15,7 @@ diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-s
 index 111111111111..222222222222 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
-@@ -32,6 +32,10 @@ properties:
+@@ -40,6 +40,10 @@ properties:
    reg:
      maxItems: 1
  

patch/kernel/archive/meson64-6.12/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch

@@ -22,14 +22,14 @@ index 111111111111..222222222222 100644
  
  #include "../core.h"
  #include "../pinctrl-utils.h"
-@@ -601,6 +602,40 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
+@@ -602,6 +603,40 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
  	return !!(val & BIT(bit));
  }
  
 +static int meson_gpio_to_irq(struct gpio_chip *chip, unsigned int gpio)
 +{
 +	struct meson_pinctrl *pc = gpiochip_get_data(chip);
-+	struct meson_bank *bank;
++	const struct meson_bank *bank;
 +	struct irq_fwspec fwspec;
 +	int hwirq;
 +
@@ -63,7 +63,7 @@ index 111111111111..222222222222 100644
  static int meson_gpiolib_register(struct meson_pinctrl *pc)
  {
  	int ret;
-@@ -616,6 +651,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc)
+@@ -617,6 +652,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc)
  	pc->chip.direction_output = meson_gpio_direction_output;
  	pc->chip.get = meson_gpio_get;
  	pc->chip.set = meson_gpio_set;
@@ -71,7 +71,7 @@ index 111111111111..222222222222 100644
  	pc->chip.base = -1;
  	pc->chip.ngpio = pc->data->num_pins;
  	pc->chip.can_sleep = false;
-@@ -679,6 +715,11 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc)
+@@ -680,6 +716,11 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc)
  	pc->fwnode = gpiochip_node_get_first(pc->dev);
  	gpio_np = to_of_node(pc->fwnode);
  

patch/kernel/archive/meson64-6.12/meson-g12a-pinctrl-add-missing-ir-options.patch

@@ -59,7 +59,7 @@ index 111111111111..222222222222 100644
  /* uart_a */
  static const unsigned int uart_a_tx_pins[]		= { GPIOX_12 };
  static const unsigned int uart_a_rx_pins[]		= { GPIOX_13 };
-@@ -737,6 +740,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
+@@ -737,6 +740,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
  	/* bank GPIOA */
  	GROUP(i2c3_sda_a,		2),
  	GROUP(i2c3_sck_a,		2),
@@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
  static const char * const uart_a_groups[] = {
  	"uart_a_tx", "uart_a_rx", "uart_a_cts", "uart_a_rts",
  };
-@@ -1266,6 +1274,7 @@ static struct meson_pmx_func meson_g12a_periphs_functions[] = {
+@@ -1266,6 +1274,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
  	FUNCTION(i2c1),
  	FUNCTION(i2c2),
  	FUNCTION(i2c3),

patch/kernel/archive/meson64-6.12/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch

@@ -83,7 +83,7 @@ index 111111111111..222222222222 100644
  
  /* pwm_e */
  static const unsigned int pwm_e_pins[]			= { GPIOX_16 };
-@@ -594,6 +598,9 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
+@@ -594,6 +598,9 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
  	GROUP(bt565_a_din5,		2),
  	GROUP(bt565_a_din6,		2),
  	GROUP(bt565_a_din7,		2),
@@ -93,7 +93,7 @@ index 111111111111..222222222222 100644
  	GROUP(tsin_b_valid_z,		3),
  	GROUP(tsin_b_sop_z,		3),
  	GROUP(tsin_b_din0_z,		3),
-@@ -726,6 +733,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
+@@ -726,6 +733,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
  	GROUP(uart_c_rts,		2),
  	GROUP(iso7816_clk_h,		1),
  	GROUP(iso7816_data_h,		1),