[PATCH 0/2] fix build failure for use-mainline-bsp

[PATCH 0/2] fix build failure for use-mainline-bsp

[Hiraku Toyooka]

Hello.

I'm working on MCIMX6Q-SDB.
I found two problems when I executed bitbake with use-mainline-bsp.
First problem is that SD card image is not generated appropriately because of
missing generation command.
Second problem is build failure of dtb files because of inconsistent dtb
filename list.
This patch series fix the above problems.

Hiraku Toyooka (2):
  image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp
  machines: fix dtb build failure when use-mainline-bsp is used

 classes/image_types_fsl.bbclass    | 1 +
 conf/machine/imx6qdlsabreauto.conf | 5 +++++
 conf/machine/imx6qdlsabresd.conf   | 5 +++++
 conf/machine/imx6slevk.conf        | 1 +
 conf/machine/imx6sxsabreauto.conf  | 1 +
 conf/machine/imx6sxsabresd.conf    | 1 +
 conf/machine/imx6ulevk.conf        | 1 +
 conf/machine/imx7dsabresd.conf     | 1 +
 8 files changed, 16 insertions(+)

-- 
2.7.4

[PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Hiraku Toyooka]

When we use the use-mainline-bsp override, SDCARD_GENERATION_COMMAND
becomes empty. As a result, incomplete SD card image is generated.
This patch fixes the problem by specifying appropriate command.

Signed-off-by: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>
---
 classes/image_types_fsl.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 91b6c4e..7609e3d 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -91,6 +91,7 @@ SDCARD_GENERATION_COMMAND_mx5 = "generate_imx_sdcard"
 SDCARD_GENERATION_COMMAND_mx6 = "generate_imx_sdcard"
 SDCARD_GENERATION_COMMAND_mx7 = "generate_imx_sdcard"
 SDCARD_GENERATION_COMMAND_vf = "generate_imx_sdcard"
+SDCARD_GENERATION_COMMAND_use-mainline-bsp = "generate_imx_sdcard"
 
 
 #
-- 
2.7.4

[PATCH 2/2] machines: fix dtb build failure when use-mainline-bsp is used

[Hiraku Toyooka]

When the use-mainline-bsp is used, dtb files listed in KERNEL_DEVICETREE
are different from ones to be build, so the build fails. This patch fixes
it by adding KERNEL_DEVICETREE_use_mainline_bsp.

Signed-off-by: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>
---
 conf/machine/imx6qdlsabreauto.conf | 5 +++++
 conf/machine/imx6qdlsabresd.conf   | 5 +++++
 conf/machine/imx6slevk.conf        | 1 +
 conf/machine/imx6sxsabreauto.conf  | 1 +
 conf/machine/imx6sxsabresd.conf    | 1 +
 conf/machine/imx6ulevk.conf        | 1 +
 conf/machine/imx7dsabresd.conf     | 1 +
 7 files changed, 15 insertions(+)

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 8967c15..8f2a4c1 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -26,6 +26,11 @@ KERNEL_DEVICETREE = " \
     imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
     imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \
 "
+KERNEL_DEVICETREE_use-mainline-bsp = " \
+    imx6qp-sabreauto.dtb \
+    imx6q-sabreauto.dtb \
+    imx6dl-sabreauto.dtb \
+"
 
 UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
 UBOOT_MAKE_TARGET = "all"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 92c9288..e85a4ac 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -26,6 +26,11 @@ KERNEL_DEVICETREE = " \
     imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
     imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb \
 "
+KERNEL_DEVICETREE_use-mainline-bsp = " \
+    imx6qp-sabresd.dtb \
+    imx6q-sabresd.dtb \
+    imx6dl-sabresd.dtb \
+"
 
 UBOOT_MACHINE ?= "mx6sabresd_defconfig"
 UBOOT_MAKE_TARGET = "all"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 52b4000..ffcbaaa 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -11,6 +11,7 @@ include conf/machine/include/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
                      imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6sl-evk.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 19a8d9f..ca5c974 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -10,6 +10,7 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-imx"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index f794636..3a969e4 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -13,6 +13,7 @@ KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \
                      imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \
                      imx6sx-sdb-reva-ldo.dtb imx6sx-sdb-reva.dtb \
                      imx6sx-sdb-btwifi.dtb imx6sx-sdb-mqs.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sdb.dtb imx6sx-sdb-sai.dtb imx6sx-sdb-reva.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6sxsabresd_config,sdcard"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index dadd525..86ad19c 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -14,6 +14,7 @@ MACHINE_FEATURES += " pci wifi bluetooth"
 KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb \
                      imx6ul-14x14-evk-gpmi-weim.dtb imx6ul-14x14-evk-usb-certi.dtb \
                      imx6ul-14x14-evk-emmc.dtb "
+KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
 
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 3a05d16..f77e537 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -16,6 +16,7 @@ KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
                      imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \
                      imx7d-sdb-reva-hdmi-audio.dtb imx7d-sdb-reva-m4.dtb imx7d-sdb-reva-qspi.dtb \
                      imx7d-sdb-reva-touch.dtb imx7d-sdb-reva-wm8960.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx7dsabresd_secure_config,sdcard"
-- 
2.7.4

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Otavio Salvador]

Hello Hiraku,

On Thu, Oct 5, 2017 at 1:21 AM, Hiraku Toyooka
<hiraku.toyooka@cybertrust.co.jp> wrote:
> When we use the use-mainline-bsp override, SDCARD_GENERATION_COMMAND
> becomes empty. As a result, incomplete SD card image is generated.
> This patch fixes the problem by specifying appropriate command.
>
> Signed-off-by: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>

I apologize but I won't apply this patch; we are in an effort of
moving away from the class. The wic support is ready for use with the
use-mainline-bsp so this is preferred instead of the class as I intend
to remove the class in next release.

If possible please test the master-next branch as it includes all the
changes you need (including your 2/2 change).

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Daiane Angolini]

On Thu, Oct 5, 2017 at 2:11 PM, Otavio Salvador
<otavio.salvador@ossystems.com.br> wrote:
> Hello Hiraku,
>
> On Thu, Oct 5, 2017 at 1:21 AM, Hiraku Toyooka
> <hiraku.toyooka@cybertrust.co.jp> wrote:
>> When we use the use-mainline-bsp override, SDCARD_GENERATION_COMMAND
>> becomes empty. As a result, incomplete SD card image is generated.
>> This patch fixes the problem by specifying appropriate command.
>>
>> Signed-off-by: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>
>
> I apologize but I won't apply this patch; we are in an effort of
> moving away from the class. The wic support is ready for use with the
> use-mainline-bsp so this is preferred instead of the class as I intend
> to remove the class in next release.
>
> If possible please test the master-next branch as it includes all the
> changes you need (including your 2/2 change).

I agree the best option is to go in the wic direction, however I think
this patch is important.

If not to be on the master, because the class sdcard is going to be
deprecated. At least to be backported to the branches using the
use-mainline-bsp override.

It would be at least Pyro.


Regards,
Daiane
>
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Otavio Salvador]

On Thu, Oct 5, 2017 at 3:00 PM, Daiane Angolini <daiane.list@gmail.com> wrote:
> On Thu, Oct 5, 2017 at 2:11 PM, Otavio Salvador
> <otavio.salvador@ossystems.com.br> wrote:
>> Hello Hiraku,
>>
>> On Thu, Oct 5, 2017 at 1:21 AM, Hiraku Toyooka
>> <hiraku.toyooka@cybertrust.co.jp> wrote:
>>> When we use the use-mainline-bsp override, SDCARD_GENERATION_COMMAND
>>> becomes empty. As a result, incomplete SD card image is generated.
>>> This patch fixes the problem by specifying appropriate command.
>>>
>>> Signed-off-by: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>
>>
>> I apologize but I won't apply this patch; we are in an effort of
>> moving away from the class. The wic support is ready for use with the
>> use-mainline-bsp so this is preferred instead of the class as I intend
>> to remove the class in next release.
>>
>> If possible please test the master-next branch as it includes all the
>> changes you need (including your 2/2 change).
>
> I agree the best option is to go in the wic direction, however I think
> this patch is important.
>
> If not to be on the master, because the class sdcard is going to be
> deprecated. At least to be backported to the branches using the
> use-mainline-bsp override.
>
> It would be at least Pyro.

For Pyro it does make sense. I'll add it.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Hiraku Toyooka]

Hello Otavio, Daiane,

Thank you for the reply.

2017-10-06 3:26 GMT+09:00 Otavio Salvador <otavio.salvador@ossystems.com.br>:
> On Thu, Oct 5, 2017 at 3:00 PM, Daiane Angolini <daiane.list@gmail.com> wrote:
>> On Thu, Oct 5, 2017 at 2:11 PM, Otavio Salvador
>> <otavio.salvador@ossystems.com.br> wrote:
>>> Hello Hiraku,
>>>
>>> On Thu, Oct 5, 2017 at 1:21 AM, Hiraku Toyooka
>>> <hiraku.toyooka@cybertrust.co.jp> wrote:
>>>> When we use the use-mainline-bsp override, SDCARD_GENERATION_COMMAND
>>>> becomes empty. As a result, incomplete SD card image is generated.
>>>> This patch fixes the problem by specifying appropriate command.
>>>>
>>>> Signed-off-by: Hiraku Toyooka <hiraku.toyooka@cybertrust.co.jp>
>>>
>>> I apologize but I won't apply this patch; we are in an effort of
>>> moving away from the class. The wic support is ready for use with the
>>> use-mainline-bsp so this is preferred instead of the class as I intend
>>> to remove the class in next release.
>>>
>>> If possible please test the master-next branch as it includes all the
>>> changes you need (including your 2/2 change).

I missed the wic support. Thank you for telling that.
I will test the master-next.

>>
>> I agree the best option is to go in the wic direction, however I think
>> this patch is important.
>>
>> If not to be on the master, because the class sdcard is going to be
>> deprecated. At least to be backported to the branches using the
>> use-mainline-bsp override.
>>
>> It would be at least Pyro.
>
> For Pyro it does make sense. I'll add it.

Thank you, it is good for Pyro users.

Best regards,
-- 
Hiraku Toyooka
Cybertrust Japan Co., Ltd.

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Otavio Salvador]

On Thu, Oct 5, 2017 at 9:39 PM, Hiraku Toyooka
<hiraku.toyooka@cybertrust.co.jp> wrote:
...
>>>> If possible please test the master-next branch as it includes all the
>>>> changes you need (including your 2/2 change).
>
> I missed the wic support. Thank you for telling that.>
>>>
>>> I agree the best option is to go in the wic direction, however I think
>>> this patch is important.
>>>
>>> If not to be on the master, because the class sdcard is going to be
>>> deprecated. At least to be backported to the branches using the
>>> use-mainline-bsp override.
>>>
>>> It would be at least Pyro.
>>
>> For Pyro it does make sense. I'll add it.
>
> Thank you, it is good for Pyro users.
>
> Best regards,
> --
> Hiraku Toyooka
> Cybertrust Japan Co., Ltd.

> I will test the master-next.

Daiane has approved the changes so I merged them on master as well.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Hiraku Toyooka]

Hello Otavio,

2017-10-06 10:33 GMT+09:00 Otavio Salvador <otavio.salvador@ossystems.com.br>:
>> I will test the master-next.
>
> Daiane has approved the changes so I merged them on master as well.

Thank you. I also tested master-next and master, and they work fine on
my environment.
By the way, when I setup master-next environment using repo,
bblayer.conf was old.

BBLAYERS = " \
${BSPDIR}/sources/poky/meta \
${BSPDIR}/sources/poky/meta-yocto \

The meta-yocto should be replaced by meta-poky. This was already done
by the following commit on master.
https://github.com/Freescale/fsl-community-bsp-base/commit/78b48d1f8c7d5c2fae4a7fa7afcba9891af39abd

I think this commit should be merged also into master-next, shouldn't it?

Best regards,
-- 
Hiraku Toyooka
Cybertrust Japan Co., Ltd.

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Otavio Salvador]

On Fri, Oct 6, 2017 at 2:05 AM, Hiraku Toyooka
<hiraku.toyooka@cybertrust.co.jp> wrote:
> 2017-10-06 10:33 GMT+09:00 Otavio Salvador <otavio.salvador@ossystems.com.br>:
>>> I will test the master-next.
>>
>> Daiane has approved the changes so I merged them on master as well.
>
> Thank you. I also tested master-next and master, and they work fine on
> my environment.
> By the way, when I setup master-next environment using repo,
> bblayer.conf was old.
>
> BBLAYERS = " \
> ${BSPDIR}/sources/poky/meta \
> ${BSPDIR}/sources/poky/meta-yocto \
>
> The meta-yocto should be replaced by meta-poky. This was already done
> by the following commit on master.
> https://github.com/Freescale/fsl-community-bsp-base/commit/78b48d1f8c7d5c2fae4a7fa7afcba9891af39abd
>
> I think this commit should be merged also into master-next, shouldn't it?

You're right. Do you mind preparing a patch for it?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH 1/2] image_types_fsl: define SDCARD_GENERATION_COMMAND for use-mainline-bsp

[Hiraku Toyooka]

2017-10-06 14:07 GMT+09:00 Otavio Salvador <otavio.salvador@ossystems.com.br>:
> On Fri, Oct 6, 2017 at 2:05 AM, Hiraku Toyooka
> <hiraku.toyooka@cybertrust.co.jp> wrote:
>> 2017-10-06 10:33 GMT+09:00 Otavio Salvador <otavio.salvador@ossystems.com.br>:
>>>> I will test the master-next.
>>>
>>> Daiane has approved the changes so I merged them on master as well.
>>
>> Thank you. I also tested master-next and master, and they work fine on
>> my environment.
>> By the way, when I setup master-next environment using repo,
>> bblayer.conf was old.
>>
>> BBLAYERS = " \
>> ${BSPDIR}/sources/poky/meta \
>> ${BSPDIR}/sources/poky/meta-yocto \
>>
>> The meta-yocto should be replaced by meta-poky. This was already done
>> by the following commit on master.
>> https://github.com/Freescale/fsl-community-bsp-base/commit/78b48d1f8c7d5c2fae4a7fa7afcba9891af39abd
>>
>> I think this commit should be merged also into master-next, shouldn't it?
>
> You're right. Do you mind preparing a patch for it?

No, not at all. I'll send the patch later.

Best regards,
-- 
Hiraku Toyooka
Cybertrust Japan Co., Ltd.