From: Otavio Salvador Date: Thu, 11 Apr 2013 21:58:49 +0000 (-0300) Subject: imx-base.inc: Do not assign UBOOT_LOADADDRESS X-Git-Tag: 2.1~1419 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=72ebba487ee9b914ebf841d3e032e86ee0cfe10d;p=meta-freescale.git imx-base.inc: Do not assign UBOOT_LOADADDRESS The code uses UBOOT_ENTRYPOINT as default value for UBOOT_LOADADDRESS so we don't need to have the variable UBOOT_LOADADDRESS set unless it's different from UBOOT_ENTRYPOINT. This also fix the i.MX6SL entry point hex format. Signed-off-by: Otavio Salvador --- diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc index 456bbfb5..c7616265 100644 --- a/meta-fsl-arm/conf/machine/include/imx-base.inc +++ b/meta-fsl-arm/conf/machine/include/imx-base.inc @@ -14,16 +14,9 @@ UBOOT_MAKE_TARGET = "u-boot.imx" UBOOT_SUFFIX ?= "imx" UBOOT_ENTRYPOINT_mx51 = "0xa0000000" -UBOOT_LOADADDRESS_mx51 = "0xa0000000" - UBOOT_ENTRYPOINT_mx53 = "0x70800000" -UBOOT_LOADADDRESS_mx53 = "0x70800000" - UBOOT_ENTRYPOINT_mx6 = "0x10800000" -UBOOT_LOADADDRESS_mx6 = "0x10800000" - -UBOOT_ENTRYPOINT_mx6sl = "0X80800000" -UBOOT_LOADADDRESS_mx6sl = "0X80800000" +UBOOT_ENTRYPOINT_mx6sl = "0x80800000" PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.11.4"