From 677cc78161fe18b5e922f9928b5fc11cad014caa Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 17 May 2020 11:17:39 +0200 Subject: apalis-tk1-mainline: rename machine to apalis-tk1 Rename the apalis-tk1-mainline machine to the now dropped apalis-tk1 machine name. Related-to: ELB-2733 Signed-off-by: Max Krummenacher (cherry picked from commit 0bf55088d1f34338dd04f83d6b90b7a72f6867de) --- conf/machine/apalis-tk1-mainline.conf | 87 --------------------- conf/machine/apalis-tk1.conf | 87 +++++++++++++++++++++ .../PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct | Bin 0 -> 8192 bytes .../u-boot/files/tegra124/apalis-tk1.img.cfg | 22 ++++++ recipes-bsp/u-boot/files/tegra124/fw_env.config | 15 ++++ .../PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct | Bin 8192 -> 0 bytes .../u-boot/files/tegra124m/apalis-tk1.img.cfg | 22 ------ recipes-bsp/u-boot/files/tegra124m/fw_env.config | 15 ---- .../u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb | 4 - recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb | 11 --- recipes-graphics/drm/libdrm_%.bbappend | 2 +- recipes-graphics/mesa/mesa-demos_%.bbappend | 2 +- recipes-graphics/mesa/mesa_%.bbappend | 14 ++-- .../xorg-xserver/xserver-xorg_1.20%.bbappend | 9 +-- .../0001-alsa-conf-select-default-soundcard.patch | 30 ------- .../0001-alsa-conf-select-default-soundcard.patch | 30 +++++++ recipes-multimedia/alsa/alsa-lib_%.bbappend | 6 +- 17 files changed, 167 insertions(+), 189 deletions(-) delete mode 100644 conf/machine/apalis-tk1-mainline.conf create mode 100644 conf/machine/apalis-tk1.conf create mode 100644 recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct create mode 100644 recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg create mode 100644 recipes-bsp/u-boot/files/tegra124/fw_env.config delete mode 100644 recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct delete mode 100644 recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg delete mode 100644 recipes-bsp/u-boot/files/tegra124m/fw_env.config delete mode 100644 recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch create mode 100644 recipes-multimedia/alsa/alsa-lib/apalis-tk1/0001-alsa-conf-select-default-soundcard.patch diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1-mainline.conf deleted file mode 100644 index 16b3383..0000000 --- a/conf/machine/apalis-tk1-mainline.conf +++ /dev/null @@ -1,87 +0,0 @@ -#@TYPE: Machine -#@NAME: Toradex Apalis TK1 Mainline -#@SOC: Tegra K1 -#@DESCRIPTION: Mainline Machine configuration for Toradex Apalis TK1 SOM -#@MAINTAINER: Dominik Sliwa - -MACHINE_NAME = "Apalis-TK1-Mainline" - -require conf/machine/include/soc-family.inc - -SOC_FAMILY = "tegra124m" - -PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline" - -KERNEL_IMAGETYPE = "zImage" -KERNEL_DEFCONFIG = "tegra_defconfig" -KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" - -MACHINE_BOOT_FILES = "boot.scr" - -# wic support -IMAGE_BOOT_FILES ?= " \ - ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ - ${MACHINE_BOOT_FILES} \ -" - -WKS_FILE_DEPENDS ?= " \ - virtual/bootloader \ - u-boot-distro-boot \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" - -WKS_FILE = "sdimage-bootpart-tegra.wks" -WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" - -# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -PREFERRED_PROVIDER_u-boot = "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils-tk1" -UBOOT_MACHINE = "apalis-tk1_defconfig" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" -# The payload offsets are given in number of 512 byte blocks. -OFFSET_BOOTROM_PAYLOAD = "0" -UBOOT_BINARY_TEZI_EMMC = "apalis-tk1.img" - -# require u-boot-dtb-tegra.bin to be used -UBOOT_IMAGE = "u-boot-dtb-tegra-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_BINARY = "u-boot-dtb-tegra.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_SUFFIX}" - -PREFERRED_PROVIDER_lxde-icon-theme_apalis-tk1-mainline = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_apalis-tk1-mainline = "lxsession" - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_VERSION_xserver-xorg_tegra124m = "99:1.20%" -PREFERRED_PROVIDER_virtual/mesa ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" - -GALLIUMDRIVERS_append_armv7a =",nouveau" -XSERVER ?= "xserver-xorg \ - mesa-driver-nouveau \ - xf86-input-evdev \ - xf86-input-keyboard \ - xf86-input-mouse \ - xf86-video-modesetting \ - " - -MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " -MACHINE_EXTRA_RDEPENDS = "linux-firmware-nvidia tdx-k20-fw" -EXTRA_IMAGEDEPENDS += "virtual/bootloader" - -# used by sysvinit_2 -SERIAL_CONSOLES = "115200;ttyS0" -IMAGE_CLASSES += "image_type_tezi" -IMAGE_FSTYPES += "wic.bmap wic.gz teziimg" - -TORADEX_PRODUCT_IDS = "0034" -TORADEX_FLASH_TYPE = "emmc" - -DEFAULTTUNE = "cortexa15hf-neon" -require conf/machine/include/tune-cortexa15.inc diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf new file mode 100644 index 0000000..6fbc589 --- /dev/null +++ b/conf/machine/apalis-tk1.conf @@ -0,0 +1,87 @@ +#@TYPE: Machine +#@NAME: Toradex Apalis TK1 +#@SOC: Tegra K1 +#@DESCRIPTION: Toradex Apalis TK1 SOM +#@MAINTAINER: Marcel Ziswiler + +MACHINE_NAME = "Apalis-TK1" + +require conf/machine/include/soc-family.inc + +SOC_FAMILY = "tegra124" + +PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline" + +KERNEL_IMAGETYPE = "zImage" +KERNEL_DEFCONFIG = "tegra_defconfig" +KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" + +MACHINE_BOOT_FILES = "boot.scr" + +# wic support +IMAGE_BOOT_FILES ?= " \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ + ${MACHINE_BOOT_FILES} \ +" + +WKS_FILE_DEPENDS ?= " \ + virtual/bootloader \ + u-boot-distro-boot \ + \ + e2fsprogs-native \ + bmap-tools-native \ +" + +WKS_FILE = "sdimage-bootpart-tegra.wks" +WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" + +# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +PREFERRED_PROVIDER_u-boot = "u-boot-toradex" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1" +PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils-tk1" +UBOOT_MACHINE = "apalis-tk1_defconfig" +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" +# The payload offsets are given in number of 512 byte blocks. +OFFSET_BOOTROM_PAYLOAD = "0" +UBOOT_BINARY_TEZI_EMMC = "apalis-tk1.img" + +# require u-boot-dtb-tegra.bin to be used +UBOOT_IMAGE = "u-boot-dtb-tegra-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_BINARY = "u-boot-dtb-tegra.${UBOOT_SUFFIX}" +UBOOT_SYMLINK = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_SUFFIX}" + +PREFERRED_PROVIDER_lxde-icon-theme_apalis-tk1 = "lxde-icon-theme" +PREFERRED_PROVIDER_lxsession-lite_apalis-tk1 = "lxsession" + +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/mesa ?= "mesa" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" + +GALLIUMDRIVERS_append_armv7a =",nouveau" +XSERVER ?= " \ + xserver-xorg \ + mesa-driver-nouveau \ + xf86-input-evdev \ + xf86-input-keyboard \ + xf86-input-mouse \ + xf86-video-modesetting \ +" + +MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " +MACHINE_EXTRA_RDEPENDS = "linux-firmware-nvidia tdx-k20-fw" +EXTRA_IMAGEDEPENDS += "virtual/bootloader" + +# used by sysvinit_2 +SERIAL_CONSOLES = "115200;ttyS0" +IMAGE_CLASSES += "image_type_tezi" +IMAGE_FSTYPES += "wic.bmap wic.gz teziimg" + +TORADEX_PRODUCT_IDS = "0034" +TORADEX_FLASH_TYPE = "emmc" + +DEFAULTTUNE = "cortexa15hf-neon" +require conf/machine/include/tune-cortexa15.inc diff --git a/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct new file mode 100644 index 0000000..556a40e Binary files /dev/null and b/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct differ diff --git a/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg b/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg new file mode 100644 index 0000000..b9d203c --- /dev/null +++ b/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg @@ -0,0 +1,22 @@ +# Copyright (C) 2016 Toradex, Inc. +# +# This software is provided 'as-is', without any express or implied +# warranty. In no event will the authors be held liable for any damages +# arising from the use of this software. +# +# Permission is granted to anyone to use this software for any purpose, +# including commercial applications, and to alter it and redistribute it +# freely, subject to the following restrictions: +# +# 1. The origin of this software must not be misrepresented; you must not +# claim that you wrote the original software. If you use this software +# in a product, an acknowledgment in the product documentation would be +# appreciated but is not required. +# 2. Altered source versions must be plainly marked as such, and must not be +# misrepresented as being the original software. +# 3. This notice may not be removed or altered from any source distribution. + +Version = 0x00400001; +Bctcopy = 1; +Bctfile = PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct; +BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-bsp/u-boot/files/tegra124/fw_env.config b/recipes-bsp/u-boot/files/tegra124/fw_env.config new file mode 100644 index 0000000..5941da2 --- /dev/null +++ b/recipes-bsp/u-boot/files/tegra124/fw_env.config @@ -0,0 +1,15 @@ +# Configuration file for fw_(printenv/setenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Device offset must be prefixed with 0x to be parsed as a hexadecimal value. +# On a block device a negative offset is treated as a backwards offset from the +# end of the device/partition, rather than a forwards offset from the start. + +# Apalis TK1 +# U-Boot environment is stored at the end of the first eMMC boot partition +# hence use a negative value. The environment is just in front of the config +# block which occupies the last sector (hence -0x200) + +# Block device name Device offset Env. size +/dev/mmcblk0boot0 -0x2200 0x2000 + diff --git a/recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct deleted file mode 100644 index 556a40e..0000000 Binary files a/recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct and /dev/null differ diff --git a/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg b/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg deleted file mode 100644 index b9d203c..0000000 --- a/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2016 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00400001; -Bctcopy = 1; -Bctfile = PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct; -BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-bsp/u-boot/files/tegra124m/fw_env.config b/recipes-bsp/u-boot/files/tegra124m/fw_env.config deleted file mode 100644 index 5941da2..0000000 --- a/recipes-bsp/u-boot/files/tegra124m/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Device offset must be prefixed with 0x to be parsed as a hexadecimal value. -# On a block device a negative offset is treated as a backwards offset from the -# end of the device/partition, rather than a forwards offset from the start. - -# Apalis TK1 -# U-Boot environment is stored at the end of the first eMMC boot partition -# hence use a negative value. The environment is just in front of the config -# block which occupies the last sector (hence -0x200) - -# Block device name Device offset Env. size -/dev/mmcblk0boot0 -0x2200 0x2000 - diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb index f968dbf..af6c461 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb @@ -43,10 +43,6 @@ do_install_append_tegra124() { install_unlock_emmc } -do_install_append_tegra124m() { - install_unlock_emmc -} - do_install_class-cross () { install -d ${D}${bindir_cross} install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv diff --git a/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb index 9d156b0..5385b20 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb @@ -4,7 +4,6 @@ require recipes-bsp/u-boot/u-boot-toradex-initial-env.inc DEPENDS += "bc-native dtc-native" DEPENDS_append_apalis-tk1 = " cbootimage-native" -DEPENDS_append_apalis-tk1-mainline = " cbootimage-native" COMPATIBLE_MACHINE = "(apalis-tk1)" @@ -12,10 +11,6 @@ SRC_URI_append_apalis-tk1 = " \ file://apalis-tk1.img.cfg \ file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \ " -SRC_URI_append_apalis-tk1-mainline = " \ - file://apalis-tk1.img.cfg \ - file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \ -" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -25,10 +20,4 @@ do_deploy_append_apalis-tk1() { cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img rm PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct } -do_deploy_append_apalis-tk1-mainline() { - cd ${DEPLOYDIR} - cp ${WORKDIR}/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct . - cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img - rm PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct -} diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend index 556cd85..f6e2376 100644 --- a/recipes-graphics/drm/libdrm_%.bbappend +++ b/recipes-graphics/drm/libdrm_%.bbappend @@ -1,4 +1,4 @@ PACKAGES += " ${PN}-tegra" FILES_${PN}-tegra = "${libdir}/libdrm_tegra.so.*" -PACKAGECONFIG_append_tegra124m = " tegra" +PACKAGECONFIG_append_tegra124 = " tegra" diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index 6521e73..1f384c1 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_apalis-tk1-mainline = " glut" +PACKAGECONFIG_append_apalis-tk1 = " glut" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 7b44575..f2f791c 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,10 +1,6 @@ -##### -## Tegra TK1 mainline kernel +PACKAGECONFIG_append_tegra124 = " dri3 egl gles gallium gbm " +EXTRA_OECONF_append_tegra124 = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug" +DRIDRIVERS_tegra124 = " " +GALLIUMDRIVERS_tegra124 = "nouveau,tegra" -PACKAGECONFIG_append_tegra124m = " dri3 egl gles gallium gbm " -EXTRA_OECONF_append_tegra124m = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug" -DRIDRIVERS_tegra124m = " " -GALLIUMDRIVERS_tegra124m = "nouveau,tegra" - -PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}" -PE_tegra124m = "99" +PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend index e33bf18..66e0628 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend @@ -1,8 +1,5 @@ -# always latest and greatest. -PE_tegra124m = "99" +COMPATIBLE_MACHINE_tegra124 = "(tegra124)" -PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}" +PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE_tegra124m = "(apalis-tk1-mainline)" - -PACKAGECONFIG_tegra124m ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} " +PACKAGECONFIG_tegra124 ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} " diff --git a/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch b/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch deleted file mode 100644 index ce18242..0000000 --- a/recipes-multimedia/alsa/alsa-lib/apalis-tk1-mainline/0001-alsa-conf-select-default-soundcard.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6d812a2c9b586be635fa430ebaa1c0e60dfa1b2d Mon Sep 17 00:00:00 2001 -From: Philippe Schenker -Date: Fri, 29 Mar 2019 15:24:23 +0100 -Subject: [PATCH] alsa-conf: select default soundcard - -Select sound card 1 as the default one. - -Signed-off-by: Philippe Schenker ---- - src/conf/alsa.conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf -index 09980586..8e7c84d6 100644 ---- a/src/conf/alsa.conf -+++ b/src/conf/alsa.conf -@@ -59,8 +59,8 @@ defaults.namehint.basic on - # show extended name hints - defaults.namehint.extended off - # --defaults.ctl.card 0 --defaults.pcm.card 0 -+defaults.ctl.card 1 -+defaults.pcm.card 1 - defaults.pcm.device 0 - defaults.pcm.subdevice -1 - defaults.pcm.nonblock 1 --- -2.21.0 - diff --git a/recipes-multimedia/alsa/alsa-lib/apalis-tk1/0001-alsa-conf-select-default-soundcard.patch b/recipes-multimedia/alsa/alsa-lib/apalis-tk1/0001-alsa-conf-select-default-soundcard.patch new file mode 100644 index 0000000..ce18242 --- /dev/null +++ b/recipes-multimedia/alsa/alsa-lib/apalis-tk1/0001-alsa-conf-select-default-soundcard.patch @@ -0,0 +1,30 @@ +From 6d812a2c9b586be635fa430ebaa1c0e60dfa1b2d Mon Sep 17 00:00:00 2001 +From: Philippe Schenker +Date: Fri, 29 Mar 2019 15:24:23 +0100 +Subject: [PATCH] alsa-conf: select default soundcard + +Select sound card 1 as the default one. + +Signed-off-by: Philippe Schenker +--- + src/conf/alsa.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf +index 09980586..8e7c84d6 100644 +--- a/src/conf/alsa.conf ++++ b/src/conf/alsa.conf +@@ -59,8 +59,8 @@ defaults.namehint.basic on + # show extended name hints + defaults.namehint.extended off + # +-defaults.ctl.card 0 +-defaults.pcm.card 0 ++defaults.ctl.card 1 ++defaults.pcm.card 1 + defaults.pcm.device 0 + defaults.pcm.subdevice -1 + defaults.pcm.nonblock 1 +-- +2.21.0 + diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index 4908618..c03a336 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend_tegra124m := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_tegra124 := "${THISDIR}/${PN}:" -PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}" +PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" -SRC_URI_append_tegra124m = " file://0001-alsa-conf-select-default-soundcard.patch" +SRC_URI_append_tegra124 = " file://0001-alsa-conf-select-default-soundcard.patch" -- cgit v1.2.3