imx-base.inc: Place UBOOT_ENTRYPOINT into common location

Place the entry points for mx31 and mx35 into the common
imx-base.inc instead of having them in board .conf files and also remove
the unneeded UBOOT_LOADADDRESS occurrences.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

diff --git a/meta-fsl-arm/conf/machine/imx31pdk.conf b/meta-fsl-arm/conf/machine/imx31pdk.conf
index 3aa660675ab7c332679d50713476bcec5f9c7efb..9ae624578b413534395518df1c59b830c1cc76e4 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx31pdk.conf
+++ b/meta-fsl-arm/conf/machine/imx31pdk.conf
@@ -14,8 +14,6 @@ UBOOT_MAKE_TARGET = "u-boot-nand.bin"
 UBOOT_SUFFIX = "bin"
 UBOOT_MACHINE = "mx31pdk_config"
 UBOOT_BINARY = "u-boot-nand.bin"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
 
 IMAGE_FSTYPES = "ubi jffs2 tar.bz2"
 MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2030"

diff --git a/meta-fsl-arm/conf/machine/imx35pdk.conf b/meta-fsl-arm/conf/machine/imx35pdk.conf
index 2d48699404383c9690eec7ae2da1d0f92daebafe..86566f2ac27c76385d98da2f4d99b6161311525e 100644 (file)
--- a/meta-fsl-arm/conf/machine/imx35pdk.conf
+++ b/meta-fsl-arm/conf/machine/imx35pdk.conf
@@ -8,8 +8,6 @@ require conf/machine/include/tune-arm1136jf-s.inc
 
 SOC_FAMILY = "mx3:mx35"
 
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_MACHINE = "mx35pdk_config"
 UBOOT_SUFFIX = "bin"
 UBOOT_BINARY = "u-boot.bin"

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index d08c5f806e4c946463608308dbfc27ba6dfae1ca..88a4d065a881d882e01f5a649fbd8e1a3a98b399 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -13,6 +13,7 @@ PERF_FEATURES_ENABLE = ""
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX ?= "imx"
 
+UBOOT_ENTRYPOINT_mx3 = "0x80008000"
 UBOOT_ENTRYPOINT_mx51  = "0x90008000"
 UBOOT_ENTRYPOINT_mx53  = "0x70008000"
 UBOOT_ENTRYPOINT_mx6  = "0x10008000"