Add machine firmware configuration for iMX SoCs

Change-Id: Ie8501d8e4336d80a7ab6c4c0415562229b2213dd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf
index 782ee6fc64e31551bb6d07d5671b931535d520c4..b8a121efa903e70f0dcd9ae10526a69f46b19c3c 100644 (file)
--- 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 759db9343320d965cf580743ec764900b5fea3bc..274eb536c54a0b6f78c497da0db34889b144c058 100644 (file)
--- 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 997ec2d4526d8cc5d94a61ff7fac278302fe2305..658df524f001602fc76cc400bc55a9d5c6b08400 100644 (file)
--- 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"