[3rdparty][PATCH 0/6] conf: boundary: add mainline BSP support to all platforms

[3rdparty][PATCH 0/6] conf: boundary: add mainline BSP support to all platforms

[Gary Bisson]

Hi,

This series adds support for mainline BSP use for all our platforms.

It has been tested on each one of the platforms.

One thing to note is that the current imx_v6_v7_defconfig selects the
fbdev driver by default, so Etnaviv can't be tested for i.MX6SX for now.

Those patches are largely inspired by what Otavio did on Nitrogen6x.
Not sure the MACHINE_ESSENTIAL_EXTRA_RDEPENDS are actually needed, this
duplicates the zImage + dtb files which are located in the first 'boot'
partition as well as the 'root' partition under the boot/ folder.
This series keeps that RDEPENDS to match Nitrogen6x but I'm wondering if
that shouldn't be removed.

Regards,
Gary

Gary Bisson (6):
  nitrogen6sx: Add wic image tool support
  nitrogen6sx: Add 'use-mainline-bsp' support
  nitrogen6x-lite: Add wic image tool support
  nitrogen6x-lite: Add 'use-mainline-bsp' support
  nitrogen7: Add wic image tool support
  nitrogen7: Add 'use-mainline-bsp' support

 conf/machine/nitrogen6sx.conf     | 16 +++++++++++++++-
 conf/machine/nitrogen6x-lite.conf | 16 +++++++++++++++-
 conf/machine/nitrogen7.conf       | 16 +++++++++++++++-
 3 files changed, 45 insertions(+), 3 deletions(-)

-- 
2.11.0

[3rdparty][PATCH 1/6] nitrogen6sx: Add wic image tool support

[Gary Bisson]

Required when mainline BSP is used. See 79b9c97f for more details.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6sx.conf | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 43f3a2e..6dea99c 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -21,6 +21,15 @@ IMAGE_BOOTLOADER ?= ""
 # Ensure boot scripts will be available at rootfs time
 do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
 
+# wic support
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = " \
+    6x_bootscript-${MACHINE};6x_bootscript \
+    ${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6sx-nitrogen6sx.dtb;imx6sx-nitrogen6sx.dtb \
+"
+IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
@@ -29,4 +38,8 @@ UBOOT_MACHINE ?= "nitrogen6sx_config"
 SERIAL_CONSOLE = "115200 ttymxc0"
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
+    kernel-image \
+    kernel-devicetree \
+"
 MACHINE_FEATURES += " pci wifi bluetooth"
-- 
2.11.0

[3rdparty][PATCH 2/6] nitrogen6sx: Add 'use-mainline-bsp' support

[Gary Bisson]

The 'use-mainline-bsp' makes use of linux-fslc as kernel.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6sx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 6dea99c..38dc414 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -13,7 +13,8 @@ KERNEL_DEVICETREE = "imx6sx-nitrogen6sx.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # Use SPI NOR U-Boot by default
 IMAGE_BOOTLOADER ?= ""
-- 
2.11.0

[3rdparty][PATCH 3/6] nitrogen6x-lite: Add wic image tool support

[Gary Bisson]

Required when mainline BSP is used. See 79b9c97f for more details.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6x-lite.conf | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index c626ed1..a64ca45 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -21,6 +21,15 @@ IMAGE_BOOTLOADER ?= ""
 # Ensure boot scripts will be available at rootfs time
 do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
 
+# wic support
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = " \
+    6x_bootscript-${MACHINE};6x_bootscript \
+    ${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb;imx6dl-nit6xlite.dtb \
+"
+IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
@@ -29,4 +38,8 @@ UBOOT_MACHINE ?= "nit6xlite_config"
 SERIAL_CONSOLE = "115200 ttymxc1"
 
 MACHINE_EXTRA_RRECOMMENDS += " bcm4330-nvram-config"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
+    kernel-image \
+    kernel-devicetree \
+"
 MACHINE_FEATURES += " pci wifi bluetooth"
-- 
2.11.0

[3rdparty][PATCH 4/6] nitrogen6x-lite: Add 'use-mainline-bsp' support

[Gary Bisson]

The 'use-mainline-bsp' makes use of linux-fslc as kernel.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6x-lite.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index a64ca45..779e100 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -13,7 +13,8 @@ KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # Use SPI NOR U-Boot by default
 IMAGE_BOOTLOADER ?= ""
-- 
2.11.0

[3rdparty][PATCH 5/6] nitrogen7: Add wic image tool support

[Gary Bisson]

Required when mainline BSP is used. See 79b9c97f for more details.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen7.conf | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index 7ea21b2..b669ffc 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -21,6 +21,15 @@ IMAGE_BOOTLOADER ?= ""
 # Ensure boot scripts will be available at rootfs time
 do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
 
+# wic support
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = " \
+    6x_bootscript-${MACHINE};6x_bootscript \
+    ${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx7d-nitrogen7.dtb;imx7d-nitrogen7.dtb \
+"
+IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
@@ -29,4 +38,8 @@ UBOOT_MACHINE ?= "nitrogen7_config"
 SERIAL_CONSOLE = "115200 ttymxc0"
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
+    kernel-image \
+    kernel-devicetree \
+"
 MACHINE_FEATURES += " pci wifi bluetooth"
-- 
2.11.0

[3rdparty][PATCH 6/6] nitrogen7: Add 'use-mainline-bsp' support

[Gary Bisson]

The 'use-mainline-bsp' makes use of linux-fslc as kernel.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen7.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index b669ffc..ff69a09 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -13,7 +13,8 @@ KERNEL_DEVICETREE = "imx7d-nitrogen7.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # Use SPI NOR U-Boot by default
 IMAGE_BOOTLOADER ?= ""
-- 
2.11.0

Re: [3rdparty][PATCH 0/6] conf: boundary: add mainline BSP support to all platforms

[Otavio Salvador]

On Thu, Apr 27, 2017 at 6:33 AM, Gary Bisson
<gary.bisson@boundarydevices.com> wrote:
> Those patches are largely inspired by what Otavio did on Nitrogen6x.
> Not sure the MACHINE_ESSENTIAL_EXTRA_RDEPENDS are actually needed, this
> duplicates the zImage + dtb files which are located in the first 'boot'
> partition as well as the 'root' partition under the boot/ folder.
> This series keeps that RDEPENDS to match Nitrogen6x but I'm wondering if
> that shouldn't be removed.

You are right, they can. :-)

-- 
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: [3rdparty][PATCH 0/6] conf: boundary: add mainline BSP support to all platforms

[Gary Bisson]

Hi Otavio,

On Thu, Apr 27, 2017 at 4:39 PM, Otavio Salvador
<otavio.salvador@ossystems.com.br> wrote:
>
> On Thu, Apr 27, 2017 at 6:33 AM, Gary Bisson
> <gary.bisson@boundarydevices.com> wrote:
> > Those patches are largely inspired by what Otavio did on Nitrogen6x.
> > Not sure the MACHINE_ESSENTIAL_EXTRA_RDEPENDS are actually needed, this
> > duplicates the zImage + dtb files which are located in the first 'boot'
> > partition as well as the 'root' partition under the boot/ folder.
> > This series keeps that RDEPENDS to match Nitrogen6x but I'm wondering if
> > that shouldn't be removed.
>
> You are right, they can. :-)

Should I send a v2 right away or do you have other remarks?

Regards,
Gary

Re: [3rdparty][PATCH 0/6] conf: boundary: add mainline BSP support to all platforms

[Otavio Salvador]

Please, do a v2.

On Thu, Apr 27, 2017 at 11:47 AM, Gary Bisson
<gary.bisson@boundarydevices.com> wrote:
> Hi Otavio,
>
> On Thu, Apr 27, 2017 at 4:39 PM, Otavio Salvador
> <otavio.salvador@ossystems.com.br> wrote:
>>
>> On Thu, Apr 27, 2017 at 6:33 AM, Gary Bisson
>> <gary.bisson@boundarydevices.com> wrote:
>> > Those patches are largely inspired by what Otavio did on Nitrogen6x.
>> > Not sure the MACHINE_ESSENTIAL_EXTRA_RDEPENDS are actually needed, this
>> > duplicates the zImage + dtb files which are located in the first 'boot'
>> > partition as well as the 'root' partition under the boot/ folder.
>> > This series keeps that RDEPENDS to match Nitrogen6x but I'm wondering if
>> > that shouldn't be removed.
>>
>> You are right, they can. :-)
>
> Should I send a v2 right away or do you have other remarks?
>
> Regards,
> Gary



-- 
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: [3rdparty][PATCH 0/6] conf: boundary: add mainline BSP support to all platforms

[Gary Bisson]

I actually just made a test without it and the boot/ folder (in the
root partition) still contains the zImage...

Is there an easy/proper way to make an image that mounts the boot
partition into boot/?

Regards,
Gary

On Thu, Apr 27, 2017 at 4:54 PM, Otavio Salvador
<otavio.salvador@ossystems.com.br> wrote:
> Please, do a v2.
>
> On Thu, Apr 27, 2017 at 11:47 AM, Gary Bisson
> <gary.bisson@boundarydevices.com> wrote:
>> Hi Otavio,
>>
>> On Thu, Apr 27, 2017 at 4:39 PM, Otavio Salvador
>> <otavio.salvador@ossystems.com.br> wrote:
>>>
>>> On Thu, Apr 27, 2017 at 6:33 AM, Gary Bisson
>>> <gary.bisson@boundarydevices.com> wrote:
>>> > Those patches are largely inspired by what Otavio did on Nitrogen6x.
>>> > Not sure the MACHINE_ESSENTIAL_EXTRA_RDEPENDS are actually needed, this
>>> > duplicates the zImage + dtb files which are located in the first 'boot'
>>> > partition as well as the 'root' partition under the boot/ folder.
>>> > This series keeps that RDEPENDS to match Nitrogen6x but I'm wondering if
>>> > that shouldn't be removed.
>>>
>>> You are right, they can. :-)
>>
>> Should I send a v2 right away or do you have other remarks?
>>
>> Regards,
>> Gary
>
>
>
> --
> 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

[3rdparty][PATCH v2 0/6] conf: boundary: add mainline BSP support to all platforms

[Gary Bisson]

Hi,

This series adds support for mainline BSP use for all our platforms.

It has been tested on each one of the platforms.

One thing to note is that the current imx_v6_v7_defconfig selects the
fbdev driver by default, so Etnaviv can't be tested for i.MX6SX for now.

Changelog v1->v2:
- Remove unnecessary MACHINE_ESSENTIAL_EXTRA_RDEPENDS

Regards,
Gary

Gary Bisson (6):
  nitrogen6sx: Add wic image tool support
  nitrogen6sx: Add 'use-mainline-bsp' support
  nitrogen6x-lite: Add wic image tool support
  nitrogen6x-lite: Add 'use-mainline-bsp' support
  nitrogen7: Add wic image tool support
  nitrogen7: Add 'use-mainline-bsp' support

 conf/machine/nitrogen6sx.conf     | 12 +++++++++++-
 conf/machine/nitrogen6x-lite.conf | 12 +++++++++++-
 conf/machine/nitrogen7.conf       | 12 +++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

-- 
2.11.0

[3rdparty][PATCH v2 1/6] nitrogen6sx: Add wic image tool support

[Gary Bisson]

Required when mainline BSP is used. See 79b9c97f for more details.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6sx.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 43f3a2e..0a4fbd7 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -21,6 +21,15 @@ IMAGE_BOOTLOADER ?= ""
 # Ensure boot scripts will be available at rootfs time
 do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
 
+# wic support
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = " \
+    6x_bootscript-${MACHINE};6x_bootscript \
+    ${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6sx-nitrogen6sx.dtb;imx6sx-nitrogen6sx.dtb \
+"
+IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
-- 
2.11.0

[3rdparty][PATCH v2 2/6] nitrogen6sx: Add 'use-mainline-bsp' support

[Gary Bisson]

The 'use-mainline-bsp' makes use of linux-fslc as kernel.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6sx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index 0a4fbd7..45b79f4 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -13,7 +13,8 @@ KERNEL_DEVICETREE = "imx6sx-nitrogen6sx.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # Use SPI NOR U-Boot by default
 IMAGE_BOOTLOADER ?= ""
-- 
2.11.0

[3rdparty][PATCH v2 3/6] nitrogen6x-lite: Add wic image tool support

[Gary Bisson]

Required when mainline BSP is used. See 79b9c97f for more details.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6x-lite.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index c626ed1..b3356e5 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -21,6 +21,15 @@ IMAGE_BOOTLOADER ?= ""
 # Ensure boot scripts will be available at rootfs time
 do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
 
+# wic support
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = " \
+    6x_bootscript-${MACHINE};6x_bootscript \
+    ${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb;imx6dl-nit6xlite.dtb \
+"
+IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
-- 
2.11.0

[3rdparty][PATCH v2 4/6] nitrogen6x-lite: Add 'use-mainline-bsp' support

[Gary Bisson]

The 'use-mainline-bsp' makes use of linux-fslc as kernel.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen6x-lite.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index b3356e5..11efddf 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -13,7 +13,8 @@ KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # Use SPI NOR U-Boot by default
 IMAGE_BOOTLOADER ?= ""
-- 
2.11.0

[3rdparty][PATCH v2 5/6] nitrogen7: Add wic image tool support

[Gary Bisson]

Required when mainline BSP is used. See 79b9c97f for more details.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen7.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index 7ea21b2..db604ad 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -21,6 +21,15 @@ IMAGE_BOOTLOADER ?= ""
 # Ensure boot scripts will be available at rootfs time
 do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
 
+# wic support
+WKS_FILE ?= "sdimage-bootpart.wks"
+IMAGE_BOOT_FILES = " \
+    6x_bootscript-${MACHINE};6x_bootscript \
+    ${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx7d-nitrogen7.dtb;imx7d-nitrogen7.dtb \
+"
+IMAGE_DEPENDS_wic_append = " dosfstools-native mtools-native"
+
 # Boot scripts to install
 BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
 
-- 
2.11.0

[3rdparty][PATCH v2 6/6] nitrogen7: Add 'use-mainline-bsp' support

[Gary Bisson]

The 'use-mainline-bsp' makes use of linux-fslc as kernel.

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
 conf/machine/nitrogen7.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index db604ad..30cfb73 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -13,7 +13,8 @@ KERNEL_DEVICETREE = "imx7d-nitrogen7.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
 # Use SPI NOR U-Boot by default
 IMAGE_BOOTLOADER ?= ""
-- 
2.11.0