imx6slevk: Use U-Boot mainline

Change-Id: I8e5b3d6b31267f6cfcfe11be9a7aa4d6a5fdfec0
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/conf/machine/imx6slevk.conf b/meta-fsl-arm/conf/machine/imx6slevk.conf
index 786822ab02efeeca32f14cbb0a2d372081433c1e..454c34f7f5ededa7bb9326adb2ad5a446f2d7016 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx6slevk.conf
+++ b/meta-fsl-arm/conf/machine/imx6slevk.conf
@@ -8,8 +8,6 @@ include conf/machine/include/tune-cortexa9.inc
 SOC_FAMILY = "mx6sl:mx6"
 
 UBOOT_MACHINE = "mx6slevk_config"
-UBOOT_SUFFIX = "bin"
-UBOOT_PADDING = "2"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index ad3df13e9570da5ac76b9ee3686be0f56a34dc4e..ffdb871862a0a99d59e13d1af39aef4fc0b84449 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -72,7 +72,6 @@ PREFERRED_PROVIDER_virtual/libgles1_mx6 ?= "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q"
 
 PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc"
-PREFERRED_PROVIDER_u-boot_mx6sl = "u-boot-imx"
 PREFERRED_PROVIDER_u-boot_mx6dl = "u-boot-imx"
 
 EXTRA_IMAGEDEPENDS = "u-boot"