Patchwork [meta-fsl-arm] imx-base.inc: Fix appending of firmware value

login
register
mail settings
Submitter Otavio Salvador
Date May 25, 2013, 7:25 p.m.
Message ID <1369509910-26394-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/50519/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - May 25, 2013, 7:25 p.m.
The appending of MACHINE_FIRMWARE were broken as it were overwriting
the board value, the fix is to append the value properly.

Change-Id: I6e2290643e32443410fdde94a334e8dfa7c7b18c
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/imx-base.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
Fabio Estevam - May 25, 2013, 8:19 p.m.
On Sat, May 25, 2013 at 4:25 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

>  # FIXME: Needs addition of firmware-imx of official BSPs
> -#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_FIRMWARE_append_mx35 = " firmware-imx-sdma-imx35"
> +#MACHINE_FIRMWARE_append_mx31 = " firmware-imx-sdma-imx31"
> +#MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27"
> +#MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25"

Not related to this patch, but I don't see the sdma firmwares for the mx6 SoCs.

Is this intended?
Otavio Salvador - May 25, 2013, 9:43 p.m.
On Sat, May 25, 2013 at 5:19 PM, Fabio Estevam <festevam@gmail.com> wrote:

> On Sat, May 25, 2013 at 4:25 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>
> >  # FIXME: Needs addition of firmware-imx of official BSPs
> > -#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_FIRMWARE_append_mx35 = " firmware-imx-sdma-imx35"
> > +#MACHINE_FIRMWARE_append_mx31 = " firmware-imx-sdma-imx31"
> > +#MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27"
> > +#MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25"
>
> Not related to this patch, but I don't see the sdma firmwares for the mx6
> SoCs.
>
> Is this intended?
>

Yes; the MX6 sdma firmware are not included in the firmware-imx.

Patch

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 88a4d06..b7d04b1 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -33,17 +33,17 @@  MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
 # Firmware
 MACHINE_FIRMWARE ?= ""
-MACHINE_FIRMWARE_mx6q = "firmware-imx-vpu-imx6q"
-MACHINE_FIRMWARE_mx6d = "firmware-imx-vpu-imx6d"
-MACHINE_FIRMWARE_mx6dl = "firmware-imx-vpu-imx6d"
-MACHINE_FIRMWARE_mx53 = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
-MACHINE_FIRMWARE_mx51 = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
+MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
+MACHINE_FIRMWARE_append_mx6d = " firmware-imx-vpu-imx6d"
+MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d"
+MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
+MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
 
 # FIXME: Needs addition of firmware-imx of official BSPs
-#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_FIRMWARE_append_mx35 = " firmware-imx-sdma-imx35"
+#MACHINE_FIRMWARE_append_mx31 = " firmware-imx-sdma-imx31"
+#MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27"
+#MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25"
 
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"