[meta-freescale] [3rdparty][PATCH][sumo 3/4] nitrogen*.conf: fix u-boot preferred provider

[Gary Bisson]

And switch to defconfig as now supported in v2017.07 release.

The missing virtual/bootloader variable was generating the following
error:
 $ bitbake u-boot-boundary
...
ERROR: Nothing PROVIDES 'u-boot-boundary'
u-boot-boundary was skipped: PREFERRED_PROVIDER_virtual/bootloader set to u-boot-fslc, not u-boot-boundary
u-boot-boundary was skipped: incompatible with machine nitrogen6x (not in COMPATIBLE_MACHINE)

Signed-off-by: Gary Bisson <gary.bisson at boundarydevices.com>
---
 conf/machine/nitrogen6sx.conf     | 5 +++--
 conf/machine/nitrogen6x-lite.conf | 5 +++--
 conf/machine/nitrogen6x.conf      | 5 +++--
 conf/machine/nitrogen7.conf       | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf
index c526ba9..9aa43d4 100644
--- a/conf/machine/nitrogen6sx.conf
+++ b/conf/machine/nitrogen6sx.conf
@@ -12,7 +12,8 @@ include conf/machine/include/tune-cortexa9.inc
 KERNEL_DEVICETREE = "imx6sx-nitrogen6sx.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
+PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
@@ -28,7 +29,7 @@ WKS_FILE_DEPENDS = " \
     bmap-tools-native \
 "
 
-UBOOT_MACHINE ?= "nitrogen6sx_config"
+UBOOT_MACHINE ?= "nitrogen6sx_defconfig"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
index 470c800..44cf5c2 100644
--- a/conf/machine/nitrogen6x-lite.conf
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -12,7 +12,8 @@ include conf/machine/include/tune-cortexa9.inc
 KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
+PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
@@ -28,7 +29,7 @@ WKS_FILE_DEPENDS = " \
     bmap-tools-native \
 "
 
-UBOOT_MACHINE ?= "nit6xlite_config"
+UBOOT_MACHINE ?= "nit6xlite_defconfig"
 
 SERIAL_CONSOLE = "115200 ttymxc1"
 
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
index ff52561..e777a14 100644
--- a/conf/machine/nitrogen6x.conf
+++ b/conf/machine/nitrogen6x.conf
@@ -46,7 +46,8 @@ KERNEL_DEVICETREE_remove_use-mainline-bsp = "imx6dl-nitrogen6_vm.dtb imx6dl-nitr
 
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
+PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
@@ -62,7 +63,7 @@ WKS_FILE_DEPENDS = " \
     bmap-tools-native \
 "
 
-UBOOT_MACHINE ?= "nitrogen6q_config"
+UBOOT_MACHINE ?= "nitrogen6q_defconfig"
 
 SERIAL_CONSOLE = "115200 ttymxc1"
 
diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf
index 388c4a3..57160e0 100644
--- a/conf/machine/nitrogen7.conf
+++ b/conf/machine/nitrogen7.conf
@@ -12,7 +12,8 @@ require conf/machine/include/tune-cortexa7.inc
 KERNEL_DEVICETREE = "imx7d-nitrogen7.dtb"
 KERNEL_IMAGETYPE = "zImage"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
+PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 
@@ -28,7 +29,7 @@ WKS_FILE_DEPENDS = " \
     bmap-tools-native \
 "
 
-UBOOT_MACHINE ?= "nitrogen7_config"
+UBOOT_MACHINE ?= "nitrogen7_defconfig"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 
-- 
2.18.0