From 93523a46ec22865c6665ad116270e95d521898c5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 8 Oct 2012 07:48:04 -0300 Subject: [PATCH] Add machine firmware configuration for iMX SoCs Change-Id: Ie8501d8e4336d80a7ab6c4c0415562229b2213dd Signed-off-by: Otavio Salvador --- meta-fsl-arm/conf/machine/imx53ard.conf | 4 +++- meta-fsl-arm/conf/machine/imx53qsb.conf | 2 ++ meta-fsl-arm/conf/machine/include/imx-base.inc | 15 ++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf index 782ee6fc..b8a121ef 100644 --- a/meta-fsl-arm/conf/machine/imx53ard.conf +++ b/meta-fsl-arm/conf/machine/imx53ard.conf @@ -14,4 +14,6 @@ UBOOT_ENTRYPOINT = "0x70800000" UBOOT_LOADADDRESS = "0x70800000" UBOOT_MACHINE = "mx53ard_config" -MACHINE_FEATURES += " wifi bluetooth" +MACHINE_FIRMWARE += "firmware-imx-ar3k \ + firmware-imx-ath6k" +MACHINE_FEATURES += "wifi bluetooth" diff --git a/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf index 759db934..274eb536 100644 --- a/meta-fsl-arm/conf/machine/imx53qsb.conf +++ b/meta-fsl-arm/conf/machine/imx53qsb.conf @@ -14,4 +14,6 @@ UBOOT_ENTRYPOINT = "0x70800000" UBOOT_LOADADDRESS = "0x70800000" UBOOT_MACHINE = "mx53loco_config" +MACHINE_FIRMWARE += "firmware-imx-ar3k \ + firmware-imx-ath6k" MACHINE_FEATURES += " wifi bluetooth" diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc index 997ec2d4..658df524 100644 --- a/meta-fsl-arm/conf/machine/include/imx-base.inc +++ b/meta-fsl-arm/conf/machine/include/imx-base.inc @@ -18,12 +18,21 @@ XSERVER = "xserver-xorg \ # Ship kernel modules MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" +# Firmware +MACHINE_FIRMWARE ?= "" +MACHINE_FIRMWARE_mx53 = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" +MACHINE_FIRMWARE_mx51 = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" +MACHINE_FIRMWARE_mx35 = "firmware-imx-sdma-imx35" +MACHINE_FIRMWARE_mx31 = "firmware-imx-sdma-imx31" +MACHINE_FIRMWARE_mx27 = "firmware-imx-vpu-imx27" +MACHINE_FIRMWARE_mx25 = "firmware-imx-sdma-imx25" + +MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" + # Extra audio support MACHINE_EXTRA_RRECOMMENDS += "imx-audio \ imx-lib \ - udev-extraconf \ - firmware-imx \ - " + udev-extraconf" # Gstreamer plugin MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin" -- 2.40.1