From: Otavio Salvador Date: Fri, 10 Apr 2015 22:32:33 +0000 (-0300) Subject: imx6sxsabreauto: Use u-boot-imx until u-boot-fslc has SabreAUTO support X-Git-Tag: 2.1~594 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a934a461c8e119c35c398d9c9b82b2059b02a4eb;p=meta-freescale.git imx6sxsabreauto: Use u-boot-imx until u-boot-fslc has SabreAUTO support Currently the U-Boot FSLC does not has the i.MX6SoloX SabreAUTO support so for the time being we are using the U-Boot i.MX fork provided by Freescale as part of 3.14-1.0.0 BSP. While on that, drop the UBOOT_ENTRYPOINT setting as it is a duplication of the value of 'imx-base.inc' file. Change-Id: I9419b6ba5e82d9ca3d12ed3cf339a23ab9b738ac Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/conf/machine/imx6sxsabreauto.conf b/meta-fsl-arm/conf/machine/imx6sxsabreauto.conf index ec880dd0..2d9ba0d8 100644 --- a/meta-fsl-arm/conf/machine/imx6sxsabreauto.conf +++ b/meta-fsl-arm/conf/machine/imx6sxsabreauto.conf @@ -10,7 +10,8 @@ SOC_FAMILY = "mx6:mx6sx" KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb" -UBOOT_ENTRYPOINT = "0x80008000" +PREFERRED_PROVIDER_u-boot = "u-boot-imx" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6sxsabreauto_config,sdcard"