Merge pull request #316 from WebPlatformForEmbedded/dev/fix-issues-main-branch

Fix Kernel Config and Display driver Device Tree overlay

Author: pwielders

board/raspberrypi/post-image.sh

@@ -91,25 +91,21 @@ __EOF__
 		;;
 		--add-vc4-fkms-v3d-overlay)
 		# Enable VC4 overlay
-		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			echo "Adding 'dtoverlay=vc4-fkms-v3d' to config.txt."
-			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+		echo "Adding 'dtoverlay=vc4-fkms-v3d' to config.txt."
+		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
 
 # Add VC4 GPU support on top of dispmanx
 dtoverlay=vc4-fkms-v3d
 __EOF__
-	        fi
 		;;
 		--add-vc4-kms-v3d-overlay)
 		# Enable VC4 overlay
-		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-			echo "Adding 'dtoverlay=vc4-kms-v3d' to config.txt."
-			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+		echo "Adding 'dtoverlay=vc4-kms-v3d' to config.txt."
+		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
 
 # Add VC4 GPU support
 dtoverlay=vc4-kms-v3d-pi4
 __EOF__
-		fi
 		;;
                 --silent)
                 if ! grep -qE '^disable_splash=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then

board/raspberrypi/rpi4-linux-5.10.config

@@ -605,7 +605,8 @@ CONFIG_RASPBERRYPI_POWER=y
 CONFIG_PWM=y
 CONFIG_PWM_BCM2835=y
 CONFIG_EXT4_FS=y
-# CONFIG_FILE_LOCKING is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
 # CONFIG_DNOTIFY is not set
 CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=850

configs/raspberrypi3_vc4_wpe_ml_defconfig

@@ -14,7 +14,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_ROOT_PASSWD="root"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi-wifi --add-miniuart-bt-overlay --overclock-pi3 --tvmode-720 --gpu_mem_1024=384 --silent"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi-wifi --add-miniuart-bt-overlay --overclock-pi3 --tvmode-720 --gpu_mem_1024=384 --silent --add-vc4-fkms-v3d-overlay"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"