nitrogen*.conf: fix u-boot preferred provider

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@boundarydevices.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Gary Bisson 2018-07-10 15:21:07 +02:00 committed by Otavio Salvador
parent b63043d4e0
commit 6146c7020a
4 changed files with 12 additions and 8 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"