Westeros package update.

Author: Neeraj Deshpande

board/raspberrypi/post-image.sh

@@ -91,12 +91,14 @@ __EOF__
 		;;
 		--add-vc4-fkms-v3d-overlay)
 		# Enable VC4 overlay
-		echo "Adding 'dtoverlay=vc4-fkms-v3d' to config.txt."
-		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+		if ! grep -qE '^dtoverlay=vc4-fkms-v3d' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+			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
+# Add VC4 GPU support
 dtoverlay=vc4-fkms-v3d
 __EOF__
+		fi
 		;;
 		--add-vc4-kms-v3d-overlay)
 		# Enable VC4 overlay
@@ -182,6 +184,16 @@ __EOF__
                         fi
                 fi
                 ;;
+		--add-dtparam-audio)
+		if ! grep -qE '^dtparam=audio=on' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+			echo "Adding 'dtparam=audio=on' to config.txt."
+			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+
+# Enable onboard ALSA audio
+dtparam=audio=on
+__EOF__
+		fi
+		;;
 	esac
 
 done

configs/raspberrypi4_wpe_wst_defconfig

@@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_TAR=y
 BR2_TARGET_GENERIC_ROOT_PASSWD="root"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi-wifi --tvmode-720 --gpu_mem_1024=384 --add-vc4-fkms-v3d-overlay --silent"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--rpi-wifi --tvmode-720 --gpu_mem_1024=384 --add-vc4-fkms-v3d-overlay --silent --add-dtparam-audio"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 
 BR2_PACKAGE_HOST_DOSFSTOOLS=y

package/rpi-firmware/rpi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ifneq ($(BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4),y)
+ifneq ($(BR2_PACKAGE_LIBDRM),y)
 RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5
 else
 RPI_FIRMWARE_VERSION = d016a6eb01c8c7326a89cb42809fed2a21525de5

package/westeros-sink/westeros-sink.mk

@@ -38,9 +38,10 @@ else ifeq ($(BR2_PACKAGE_HAS_NEXUS),y)
 			CXXFLAGS="$(TARGET_CXXFLAGS) -I${STAGING_DIR}/usr/include/refsw -I${STAGING_DIR}/usr/include/refsw/bseav"
 	WESTEROS_SINK_MAKE_ENV += PKG_CONFIG_SYSROOT_DIR=${STAGING_DIR}
 else ifeq ($(BR2_PACKAGE_LIBDRM),y)
-	WESTEROS_SINK_SUBDIR = drm/westeros-sink
+	WESTEROS_SINK_SUBDIR = v4l2/westeros-sink
 	WESTEROS_SINK_DEPENDENCIES += gstreamer1
-	WESTEROS_SINK_CONF_OPTS += --enable-gstreamer1=yes
+	WESTEROS_SINK_CONF_OPTS += --enable-gstreamer1=yes CFLAGS="$(TARGET_CFLAGS) -x c++"
+	export STAGING_INCDIR=${STAGING_DIR}/usr/include
 endif
 
 define WESTEROS_SINK_RUN_AUTOCONF

package/westeros-soc/0001-Change-default-card.patch

@@ -0,0 +1,12 @@
+diff -ruN westeros.orig/drm/westeros-gl/westeros-gl.c westeros/drm/westeros-gl/westeros-gl.c
+--- westeros.orig/drm/westeros-gl/westeros-gl.c	2021-06-04 21:14:52.000000000 +0530
++++ westeros/drm/westeros-gl/westeros-gl.c	2021-06-15 17:43:35.947397519 +0530
+@@ -65,7 +65,7 @@
+ #define TRACE3(...)                 INT_TRACE3(__VA_ARGS__, "")
+ #define FRAME(...)                  INT_FRAME(__VA_ARGS__, "")
+ 
+-#define DEFAULT_CARD "/dev/dri/card0"
++#define DEFAULT_CARD "/dev/dri/card1"
+ #ifdef WESTEROS_PLATFORM_QEMUX86
+ #define DEFAULT_MODE_WIDTH (1280)
+ #define DEFAULT_MODE_HEIGHT (1024)