Merge branch 'MichaIng:master' into dietpi-banner

Author: timjolson

.build/images/OdroidC1/boot.ini

@@ -79,7 +79,7 @@ if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
 if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
 
 # Boot arguments
-setenv bootargs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait rw ${condev} consoleblank=0 fsck.repair=yes net.ifnames=0 vdaccfg=0xa000 dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac} monitor_onoff=${monitor_onoff} max_freq=${max_freq} ${hid_quirks}"
+setenv bootargs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait rw ${condev} fsck.repair=yes net.ifnames=0 vdaccfg=0xa000 dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac} monitor_onoff=${monitor_onoff} max_freq=${max_freq} ${hid_quirks}"
 
 # Booting
 fatload mmc 0:1 0x20800000 uImage

.build/images/OdroidXU4/boot.ini

@@ -5,7 +5,7 @@ setenv initrd_high "0xffffffff"
 setenv fdt_high "0xffffffff"
 
 # Kernel command-line parameters
-setenv bootrootfs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait ro console=ttySAC2,115200n8 console=tty1 consoleblank=0 fsck.repair=yes net.ifnames=0"
+setenv bootrootfs "root=/dev/mmcblk0p1 rootfstype=ext4 rootwait ro console=ttySAC2,115200n8 console=tty1 fsck.repair=yes net.ifnames=0"
 
 # HDMI CEC: "false" or "true", defaults to "true"
 #setenv cecenable "true"

.build/images/Quartz64/quartz64_defconfig

@@ -770,11 +770,36 @@ CONFIG_RTL8821AE=y
 CONFIG_RTL8XXXU=y
 CONFIG_RTL8XXXU_UNTESTED=y
 CONFIG_RTLLIB=m
-CONFIG_RTW88=y
-CONFIG_RTW88_8723DE=y
-CONFIG_RTW88_8821CE=y
-CONFIG_RTW88_8822BE=y
-CONFIG_RTW88_8822CE=y
+CONFIG_RTW88=m
+CONFIG_RTW88_8723CS=m
+CONFIG_RTW88_8723DE=m
+CONFIG_RTW88_8723DS=m
+CONFIG_RTW88_8723DU=m
+CONFIG_RTW88_8812AU=m
+CONFIG_RTW88_8814AE=m
+CONFIG_RTW88_8814AU=m
+CONFIG_RTW88_8821AE=m
+CONFIG_RTW88_8821AU=m
+CONFIG_RTW88_8821CE=m
+CONFIG_RTW88_8821CS=m
+CONFIG_RTW88_8821CU=m
+CONFIG_RTW88_8822BE=m
+CONFIG_RTW88_8822BS=m
+CONFIG_RTW88_8822BU=m
+CONFIG_RTW88_8822CE=m
+CONFIG_RTW88_8822CS=m
+CONFIG_RTW88_8822CU=m
+CONFIG_RTW89=m
+CONFIG_RTW89_8851BE=m
+CONFIG_RTW89_8851BU=m
+CONFIG_RTW89_8852AE=m
+CONFIG_RTW89_8852AU=m
+CONFIG_RTW89_8852BE=m
+CONFIG_RTW89_8852BTE=m
+CONFIG_RTW89_8852BU=m
+CONFIG_RTW89_8852CE=m
+CONFIG_RTW89_8852CU=m
+CONFIG_RTW89_8922AE=m
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_MV=y

.build/images/RPi/config.txt

@@ -2,16 +2,12 @@
 # Overlays: https://github.com/raspberrypi/firmware/blob/master/boot/overlays/README
 
 #-------Display---------
-# Max allocated framebuffers: Set to "0" in headless mode to reduce memory usage
-# - Defaults to "2" on RPi4 and "1" on earlier RPi models
-#max_framebuffers=0
-
 # If you get no picture, set the following to "1" to apply most compatible HDMI settings.
 #hdmi_safe=1
 
 # Uncomment to adjust the HDMI signal strength if you have interferences, blanking, or no display.
 # - Ranges from "0" to "11", use values above "7" only if required, e.g. with very long HDMI cable.
-# - Default on first RPi1 A/B is "2", else "5", on RPi4 this setting is ignored.
+# - Defaults to "2" on first RPi1 A/B, else "5". From RPi4 on, this setting is ignored.
 #config_hdmi_boost=5
 
 # Uncomment if HDMI display is not detected and composite is being outputted.
@@ -20,25 +16,14 @@
 # Uncomment to disable HDMI even if plugged, e.g. to force composite output.
 #hdmi_ignore_hotplug=1
 
-# Uncomment to force a console size. By default it will be display's size minus overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# Uncomment to enable SDTV/composite output on RPi4. This has no effect on previous RPi models.
+# Uncomment to enable SDTV/composite output from RPi4 on. This has no effect on previous RPi models.
 #enable_tvout=1
-# SDTV mode
-#sdtv_mode=0
-
-# Uncomment to force a specific HDMI mode (this will force VGA).
-#hdmi_group=1
-#hdmi_mode=1
 
 # Uncomment to force an HDMI mode rather than DVI. This enables HDMI audio in DMT modes.
 #hdmi_drive=2
 
 # Set "hdmi_blanking=1" to allow the display going into standby after 10 minutes without input.
 # With default value "0", the display shows a blank screen instead, but will not go into standby.
-# NB: Some legacy OpenMAX applications (OMXPlayer) cannot wake screens from real standby.
 hdmi_blanking=1
 
 # Set to "1" if your display has a black border of unused pixels visible.
@@ -51,12 +36,15 @@ disable_overscan=1
 #overscan_top=16
 #overscan_bottom=16
 
-# Rotation
-#display_hdmi_rotate=0
+# LCD/OLED Rotation
 #lcd_rotate=0
 
+# Enable KMS/DRM display driver, recommended when a GUI application or desktop is used.
+# Remove ",noaudio" if HDMI audio is needed, or enable it via dietpi-config.
+#dtoverlay=vc4-kms-v3d,noaudio
+
 #-------RPi camera module-------
-#start_x=1
+#camera_auto_detect=1
 #disable_camera_led=1
 
 #-------GPU memory splits-------

.build/images/U-Boot/boot.cmd

@@ -24,7 +24,7 @@ if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dietpiEnv.txt"; then
 fi
 
 # Define kernel command-line arguments
-setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 coherent_pool=2M ubootpart=${ubootpart} ${extraargs}"
+setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} coherent_pool=2M ubootpart=${ubootpart} ${extraargs}"
 
 # Load device tree and apply overlays
 load "${devtype}" "${devnum}" "${fdt_addr_r}" "${prefix}dtb/${fdtfile}"
@@ -37,8 +37,18 @@ if test -n "${overlays}${user_overlays}"; then
 			if test -e  "${devtype}" "${devnum}" "${prefix}dtb/${overlay_path}/overlay/${pre}-${overlay}.dtbo"; then
 				if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dtb/${overlay_path}/overlay/${pre}-${overlay}.dtbo"; then
 					echo "Applying kernel provided DT overlay ${pre}-${overlay}.dtbo"
-					fdt apply "${scriptaddr}" || setenv overlay_error "true"
+					if fdt apply "${scriptaddr}"; then
+						if test -e "${devtype}" "${devnum}" "${prefix}dtb/${overlay_path}/overlay/${pre}-${overlay}.scr"; then
+							if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dtb/${overlay_path}/overlay/${pre}-${overlay}.scr"; then
+								echo "Applying kernel provided DT overlay fixup script ${pre}-${overlay}.scr"
+								source "${scriptaddr}" || setenv overlay_error "true"
+							fi
+						fi
+					else
+						setenv overlay_error "true"
+					fi
 				fi
+				break
 			fi
 		done
 	done
@@ -53,21 +63,6 @@ if test -n "${overlays}${user_overlays}"; then
 	if test "${overlay_error}" = "true"; then
 		echo "Error applying DT overlays, restoring original DT"
 		load "${devtype}" "${devnum}" "${fdt_addr_r}" "${prefix}dtb/${fdtfile}"
-	else
-		for pre in ${overlay_prefix}; do
-			if test -e "${devtype}" "${devnum}" "${prefix}dtb/${overlay_path}/overlay/${pre}-fixup.scr"; then
-				if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}dtb/${overlay_path}/overlay/${pre}-fixup.scr"; then
-					echo "Applying kernel provided DT fixup script ${pre}-fixup.scr"
-					source "${scriptaddr}"
-				fi
-			fi
-		done
-		if test -e "${devtype}" "${devnum}" "${prefix}fixup.scr"; then
-			if load "${devtype}" "${devnum}" "${scriptaddr}" "${prefix}fixup.scr"; then
-				echo "Applying user provided DT fixup script fixup.scr"
-				source "${scriptaddr}"
-			fi
-		fi
 	fi
 fi
 

.build/images/dietpi-build

@@ -146,24 +146,24 @@ case $HW_MODEL in
 	'76.1') iname='NanoPiR5S' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
 	'76.2') iname='NanoPiR5C' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
 	77) iname='ROCK3A' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
-	78) iname='ROCK5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
-	'79.1') iname='NanoPiR6S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
-	'79.2') iname='NanoPiR6C' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
-	'79.3') iname='NanoPCT6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
-	80) iname='OrangePi5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
+	78) iname='ROCK5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
+	'79.1') iname='NanoPiR6S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
+	'79.2') iname='NanoPiR6C' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
+	'79.3') iname='NanoPCT6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
+	80) iname='OrangePi5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
 	81) iname='VisionFive2' HW_ARCH=11 root_size='riscv';;
-	82) iname='OrangePi5Plus' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
+	82) iname='OrangePi5Plus' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
 	83) iname='OrangePiZero3' HW_ARCH=3 partition_start=4 root_size='sunxi64';;
 	84) iname='Star64' HW_ARCH=11 root_size='riscv';;
-	85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
+	85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
 	86) iname='ASUSTB2' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
 	87) iname='OrangePi3B' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
 	88) iname='OrangePiZero2W' HW_ARCH=3 partition_start=4 root_size='sunxi64';;
 	89) iname='OrangePi3LTS' HW_ARCH=3 partition_start=4 root_size='sunxi64';;
 	90) iname='RadxaZERO3' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
 	91) iname='OrangePi5Max' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
-	92) iname='NanoPiM6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
-	93) iname='OrangePi5Pro' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
+	92) iname='NanoPiM6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
+	93) iname='OrangePi5Pro' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
 	94) iname='OrangePi5Ultra' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
 	95) iname='OrangePiCM5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
 	96) iname='OrangePi4A' HW_ARCH=3 partition_start=4 root_size='sunxi64';;
@@ -172,11 +172,11 @@ case $HW_MODEL in
 	99) iname='OrangePi3' HW_ARCH=3 partition_start=4 root_size='sunxi64';;
 	100) iname='NanoPiR3S' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
 	101) iname='NanoPiR3SLTS' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
-	102) iname='NanoPiR76S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
-	103) iname='NanoPiM5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
+	102) iname='NanoPiR76S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
+	103) iname='NanoPiM5' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
 	104) iname='NanoPiZero2' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
 	105) iname='OrangePi4LTS' HW_ARCH=3 partition_start=16 root_size='rockchip64';;
-	106) iname='OrangePi5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rk35xx';;
+	106) iname='OrangePi5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size='rockchip64';;
 	*) Error_Exit "Invalid hardware model \"$HW_MODEL\" passed";;
 esac
 case $root_size in
@@ -219,7 +219,7 @@ esac
 # Check for valid partition table type and set variables accordingly
 case $PTTYPE in
 	'msdos') [[ $HW_MODEL == 21 ]] && iname+='-BIOS';;
-	'gpt') [[ $HW_ARCH == 10 ]] && efi_size=64 iname+='-UEFI';;
+	'gpt') [[ $HW_MODEL == 21 || $HW_MODEL == 20 ]] && efi_size=64 iname+='-UEFI';;
 	*) Error_Exit "Invalid partition table type \"$PTTYPE\" passed";;
 esac
 
@@ -288,7 +288,7 @@ fi
 # Exit trap for cleanup
 # shellcheck disable=SC2329
 G_EXIT_CUSTOM(){
-	findmnt -M "$FP_ORIGIN/rootfs" &> /dev/null && G_EXEC umount -R "$FP_ORIGIN/rootfs"
+	findmnt "$FP_ORIGIN/rootfs" &> /dev/null && G_EXEC umount -R "$FP_ORIGIN/rootfs"
 	[[ -d $FP_ORIGIN/rootfs ]] && G_EXEC rmdir "$FP_ORIGIN/rootfs"
 	[[ $FP_LOOP ]] && losetup "$FP_LOOP" &> /dev/null && G_EXEC losetup -d "$FP_LOOP"
 	[[ -f $OUTPUT_IMG_NAME.img ]] && G_EXEC rm "$OUTPUT_IMG_NAME.img"
@@ -1282,7 +1282,7 @@ _EOF_
 	[[ -x 'upload.sh' ]] && G_EXEC_OUTPUT=1 G_EXEC ./upload.sh "$image_name.tar.xz"{,.sha256} "${signature[@]}" && G_EXEC rm "$image_name.tar.xz"{,.sha256} "${signature[@]}"
 fi
 
-####### Proxmox ############################
+####### Proxmox ##########################
 if [[ $VARIANT =~ ^(proxmox|all)$ ]]
 then
 	# Convert raw image to QCOW2