From: Otavio Salvador Date: Sat, 30 Mar 2013 22:53:19 +0000 (-0300) Subject: imx6slevk: Use U-Boot mainline X-Git-Tag: 2.1~1434 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=54507f2360c5e1090959ef99b0f57465e0ca54cf;p=meta-freescale.git imx6slevk: Use U-Boot mainline Change-Id: I8e5b3d6b31267f6cfcfe11be9a7aa4d6a5fdfec0 Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/conf/machine/imx6slevk.conf b/meta-fsl-arm/conf/machine/imx6slevk.conf index 786822ab..454c34f7 100644 --- 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 ad3df13e..ffdb8718 100644 --- 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"