diff options
| -rw-r--r-- | conf/machine/imx6qdlsabreauto.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6qdlsabresd.conf | 2 | ||||
| -rw-r--r-- | conf/machine/imx6ulevk.conf | 6 | ||||
| -rw-r--r-- | conf/machine/include/imx-base.inc | 25 | ||||
| -rw-r--r-- | recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb | 3 |
5 files changed, 25 insertions, 13 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index fabd4cd0..71b1cf88 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -33,6 +33,8 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ " UBOOT_MACHINE ?= "mx6sabreauto_defconfig" + +# Use fslc u-boot by default. See also imx-base.inc. UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 7cde5059..a8407e28 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -33,6 +33,8 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \ " UBOOT_MACHINE ?= "mx6sabresd_defconfig" + +# Use fslc u-boot by default. See also imx-base.inc. UBOOT_MAKE_TARGET = "all" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 14f83828..01ebce6f 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -16,12 +16,14 @@ KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14- imx6ul-14x14-evk-emmc.dtb " KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" +# Use fslc u-boot by default. See also imx-base.inc. +UBOOT_MAKE_TARGET = "" UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" -UBOOT_MAKE_TARGET = "" +WKS_FILE = "imx-uboot-spl-bootpart.wks" + UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard" UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" -WKS_FILE = "imx-uboot-spl-bootpart.wks" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6366ae82..20f861f2 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -207,16 +207,9 @@ MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" # Extra audio support -# FIXME: Add support for ALL SoC families -MACHINE_EXTRA_RRECOMMENDS_append_mx6dl = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx6q = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx6sl = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx6sll = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx6sx = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx6ul = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx6ull = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx7d = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" -MACHINE_EXTRA_RRECOMMENDS_append_mx7ulp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" +MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" +MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" +MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)}" # Extra udev rules MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" @@ -310,6 +303,18 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" +# Certain machines override the default fsl u-boot with the +# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: +# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" +UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" +UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" +SPL_BINARY_use-fsl-bsp_mx6 = "" +WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks" +UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" +UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" +SPL_BINARY_use-fsl-bsp_mx7 = "" +WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks" + SERIAL_CONSOLE = "115200 ttymxc0" SERIAL_CONSOLE_mxs = "115200 ttyAMA0" diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb index c96a8835..94c3f4a7 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb @@ -1,4 +1,5 @@ # Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright (C) 2017-2019 NXP # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "Freescale alsa-lib plugins" @@ -32,4 +33,4 @@ FILES_${PN} += "${libdir}/alsa-lib/libasound_*.so" FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" FILES_${PN}-dev += "${libdir}/alsa-lib/*.la" -COMPATIBLE_MACHINE = "(mx6dl|mx6q|mx6sl|mx6sx|mx6ul|mx6ull|mx7d|mx7ulp)" +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" |