genio: add alsa-ucm-conf + ucm2 config for working audio in userspace

config/kernel/linux-genio-collabora.config

@@ -304,7 +304,6 @@ CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCIE_MEDIATEK_GEN3=m
 CONFIG_PCI_XGENE=y
-CONFIG_PCI_MESON=m
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_KIRIN=y
 CONFIG_PCI_ENDPOINT=y
@@ -359,9 +358,9 @@ CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NBD=y
 CONFIG_VIRTIO_BLK=y
-CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_NVME=y
 CONFIG_SRAM=y
 CONFIG_PCI_ENDPOINT_TEST=m
 CONFIG_NTSYNC=m
@@ -384,8 +383,8 @@ CONFIG_AHCI_CEVA=y
 CONFIG_SATA_SIL24=y
 CONFIG_PATA_OF_PLATFORM=y
 CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_MD=y
+CONFIG_BLK_DEV_DM=y
 CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_NETDEVICES=y
@@ -549,22 +548,22 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_CADENCE=m
+CONFIG_I2C_CADENCE=y
 CONFIG_I2C_DESIGNWARE_CORE=y
-CONFIG_I2C_GPIO=m
+CONFIG_I2C_GPIO=y
 CONFIG_I2C_MT65XX=y
 CONFIG_I2C_RK3X=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_SLAVE=y
 CONFIG_SPI=y
 CONFIG_SPI_CADENCE_QUADSPI=y
-CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DESIGNWARE=y
 CONFIG_SPI_DW_DMA=y
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_MT65XX=y
-CONFIG_SPI_MTK_NOR=m
+CONFIG_SPI_MTK_NOR=y
 CONFIG_SPI_PL022=y
-CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_SPIDEV=y
 CONFIG_SPMI=y
 CONFIG_SPMI_MTK_PMIF=y
 CONFIG_PINCTRL_DA9062=m
@@ -593,13 +592,13 @@ CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_NVMEM_REBOOT_MODE=m
-CONFIG_POWER_SEQUENCING=m
+CONFIG_POWER_SEQUENCING=y
 CONFIG_POWER_SEQUENCING_QCOM_WCN=m
 CONFIG_BATTERY_QCOM_BATTMGR=m
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_BQ27XXX=y
 CONFIG_BATTERY_MAX17042=m
-CONFIG_CHARGER_MT6360=m
+CONFIG_CHARGER_MT6360=y
 CONFIG_CHARGER_BQ25890=m
 CONFIG_CHARGER_BQ25980=m
 CONFIG_CHARGER_RK817=m
@@ -627,22 +626,22 @@ CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_ARM_SBSA_WATCHDOG=y
 CONFIG_DW_WATCHDOG=y
 CONFIG_ARM_SMC_WATCHDOG=y
-CONFIG_MFD_ADP5585=m
+CONFIG_MFD_ADP5585=y
 CONFIG_MFD_BD9571MWV=y
 CONFIG_MFD_AXP20X_I2C=y
-CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9062=y
 CONFIG_MFD_HI6421_PMIC=y
 CONFIG_MFD_MAX77620=y
-CONFIG_MFD_MAX77759=m
+CONFIG_MFD_MAX77759=y
 CONFIG_MFD_MT6360=y
 CONFIG_MFD_MT6397=y
 CONFIG_MFD_RK8XX_I2C=y
 CONFIG_MFD_RK8XX_SPI=y
 CONFIG_MFD_SEC_I2C=y
-CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TI_LP873X=y
 CONFIG_MFD_TPS65219=y
-CONFIG_MFD_TPS6594_I2C=m
-CONFIG_MFD_WM8994=m
+CONFIG_MFD_TPS6594_I2C=y
+CONFIG_MFD_WM8994=y
 CONFIG_MFD_ROHM_BD718XX=y
 CONFIG_MFD_WCD934X=m
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -957,8 +956,8 @@ CONFIG_MMC_SDHCI_XENON=y
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_UFSHCD_PLATFORM=y
-CONFIG_SCSI_UFS_CDNS_PLATFORM=m
-CONFIG_SCSI_UFS_MEDIATEK=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=y
+CONFIG_SCSI_UFS_MEDIATEK=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_MULTICOLOR=m
@@ -998,7 +997,7 @@ CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_CROS_EC=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_IMX_BBM_SCMI=y
-CONFIG_RTC_DRV_MT6397=m
+CONFIG_RTC_DRV_MT6397=y
 CONFIG_DMADEVICES=y
 CONFIG_BCM_SBA_RAID=m
 CONFIG_FSL_EDMA=y
@@ -1074,9 +1073,9 @@ CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y
 CONFIG_IIO=y
 CONFIG_MAX9611=m
-CONFIG_MEDIATEK_MT6359_AUXADC=m
-CONFIG_MEDIATEK_MT6360_ADC=m
-CONFIG_MEDIATEK_MT6577_AUXADC=m
+CONFIG_MEDIATEK_MT6359_AUXADC=y
+CONFIG_MEDIATEK_MT6360_ADC=y
+CONFIG_MEDIATEK_MT6577_AUXADC=y
 CONFIG_QCOM_SPMI_VADC=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_TI_ADS1015=m
@@ -1103,7 +1102,7 @@ CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_DPHY_RX=m
 CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHY_CADENCE_SALVO=m
-CONFIG_PHY_MTK_PCIE=m
+CONFIG_PHY_MTK_PCIE=y
 CONFIG_PHY_MTK_TPHY=y
 CONFIG_PHY_MTK_HDMI=y
 CONFIG_PHY_MTK_MIPI_DSI=y
@@ -1155,6 +1154,12 @@ CONFIG_HUGETLBFS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_UBIFS_FS=m
 CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
 CONFIG_PSTORE_RAM=m
 CONFIG_EROFS_FS=m
 CONFIG_NFS_FS=y
@@ -1172,9 +1177,16 @@ CONFIG_SECURITY=y
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_BENCHMARK=m
-CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_CMAC=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_SM3_ARM64_CE=m

config/sources/families/genio.conf

@@ -281,3 +281,95 @@ function add_host_dependencies__genio_python3_deps_for_optee_build() {
 function write_uboot_platform() {
 	: # noop; this means `armbian-install` can't be used to flash u-boot; users must use mtkflash or similar
 }
+
+## Audio; needs alsa-ucm-conf package plus mediatek-specific UCM files
+function post_family_config__genio_userspace_audio() {
+	add_packages_to_image "alsa-ucm-conf" # also needs mediatek-specific UCM files; see pre_customize_image__genio_1200_alsa_ucm_conf
+}
+
+# From https://gitlab.collabora.com/mediatek/aiot/debian-image-recipes/-/tree/main/overlays/alsa-ucm-sof-mt8395-evk/ucm2 @ 24d7cca9272b594259c43f316e678ac348cdc0f2
+function pre_customize_image__genio_1200_alsa_ucm_conf() {
+	display_alert "Add alsa-ucm-conf for Mediatek" "genio :: ${BOARD}" "info"
+
+	declare dest_dir_sof="${SDCARD}/usr/share/alsa/ucm2/MediaTek/sof-mt8395-evk"
+	mkdir -p "${dest_dir_sof}"
+	cat <<- 'MEDIATEK_HIFI' > "${dest_dir_sof}/HiFi.conf"
+		If.HDMI {
+			Condition {
+				Type ControlExists
+				Control "iface=CARD,name='HDMI Jack'"
+			}
+			True {
+				SectionDevice."HDMI1" {
+					Comment "HDMI output"
+					EnableSequence [
+						cset "name='HDMI_OUT_MUX' 1"
+					]
+					DisableSequence [
+						cset "name='HDMI_OUT_MUX' 0"
+					]
+					Value {
+						PlaybackPriority 200
+						PlaybackPCM "hw:${CardId},5"
+						JackControl "HDMI Jack"
+					}
+				}
+			}
+		}
+		SectionDevice."Headphones" {
+			Comment "Earphone speaker"
+			EnableSequence [
+				cset "name='HP Mux' Audio Playback"
+			]
+			DisableSequence [
+				cset "name='HP Mux' Open"
+			]
+			Value {
+				PlaybackPriority 400
+				PlaybackChannels 2
+				PlaybackPCM "hw:${CardId},16"
+				JackControl "Headphone Jack"
+			}
+		}
+	MEDIATEK_HIFI
+
+	cat <<- 'MEDIATEK_MT8395_EVK' > "${dest_dir_sof}/sof-mt8395-evk.conf"
+		Syntax 4
+		SectionUseCase."HiFi" {
+			File "/MediaTek/sof-mt8395-evk/HiFi.conf"
+			Comment "Play high quality music"
+		}
+		BootSequence [
+			cset "name='HP Mux' Audio Playback"
+			cset "name='LOL Mux' Open"
+			cset "name='MISO0_MUX' UL1_CH1"
+			cset "name='MISO1_MUX' UL1_CH1"
+			cset "name='ADC_L_Mux' Left Preamplifier"
+			cset "name='ADC_R_Mux' Right Preamplifier"
+			cset "name='ADC_3_Mux' Preamplifier"
+			cset "name='ETDM_OUT3_Clock_Source' a1sys_a2sys"
+			cset "name='PGA_L_Mux' AIN1"
+			cset "name='PGA_R_Mux' AIN2"
+			cset "name='PGA_3_Mux' AIN3"
+			cset "name='HDMI_OUT_MUX' Connect"
+			cset "name='DPTX_OUT_MUX' Disconnect"
+			cset "name='Lineout Volume' 10"
+			cset "name='Headset Volume' 2"
+			cset "name='PGA1 Volume' 4"
+			cset "name='PGA2 Volume' 4"
+			cset "name='PGA3 Volume' 4"
+			cset "name='O000 I000 Switch' on"
+			cset "name='O001 I001 Switch' on"
+			cset "name='O034 I168 Switch' on"
+			cset "name='O035 I169 Switch' on"
+			cset "name='O040 I002 Switch' on"
+			cset "name='O041 I003 Switch' on"
+			cset "name='O176 I070 Switch' on"
+			cset "name='O177 I071 Switch' on"
+		]
+	MEDIATEK_MT8395_EVK
+
+	declare dest_dir_conf="${SDCARD}/usr/share/alsa/ucm2/conf.d/sof-mt8395-evk"
+	mkdir -p "${dest_dir_conf}"
+	run_host_command_logged ln -sfv "../../MediaTek/sof-mt8395-evk/sof-mt8395-evk.conf" "${dest_dir_conf}/sof-mt8395-evk.conf"
+}

patch/u-boot/u-boot-genio/3306-GENIO-mt8195-fdt_addr_r-kernel_addr_r-ramdisk_addr_r-for-large-kernels-initrds.patch

@@ -5,21 +5,23 @@ Subject: GENIO: mt8195: fdt_addr_r/kernel_addr_r/ramdisk_addr_r for large
  kernels/initrds
 
 General purpose OS's like Armbian have some huge initrds and kernels, make space.
+- include pxefile_addr_r == scriptaddr at 0x40000000 so PXE works OOB
 
 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
 ---
- include/configs/mt8195.h | 12 +++++-----
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ include/configs/mt8195.h | 14 ++++++----
+ 1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/include/configs/mt8195.h b/include/configs/mt8195.h
 index 111111111111..222222222222 100644
 --- a/include/configs/mt8195.h
 +++ b/include/configs/mt8195.h
-@@ -133,11 +133,11 @@
+@@ -133,11 +133,12 @@
  #if !IS_ENABLED(CONFIG_SPI_FLASH)
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	"scriptaddr=0x40000000\0" \
 -	"fdt_addr_r=0x44000000\0" \
++	"pxefile_addr_r=0x40000000\0" \
 +	"fdt_addr_r=0x56000000\0" \
  	"fdtoverlay_addr_r=0x44c00000\0" \
  	"fdt_resize=0x3000\0" \
@@ -30,11 +32,12 @@ index 111111111111..222222222222 100644
  	"fdtfile=" CONFIG_DEFAULT_FDT_FILE ".dtb\0" \
  	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
  	"splashsource=mmc_fs\0" \
-@@ -148,11 +148,11 @@
+@@ -148,11 +149,12 @@
  #else
  #define CONFIG_EXTRA_ENV_SETTINGS \
  	"scriptaddr=0x40000000\0" \
 -	"fdt_addr_r=0x44000000\0" \
++	"pxefile_addr_r=0x40000000\0" \
 +	"fdt_addr_r=0x56000000\0" \
  	"fdtoverlay_addr_r=0x44c00000\0" \
  	"fdt_resize=0x3000\0" \