aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-04-18 15:25:08 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2013-04-18 16:04:55 -0300
commit8af144a9f5a26dcd9c999e97374f19bdb618590d (patch)
treed42a006df1794d328f1932d1d7bfb80da8538f56
parentef81f1a674e4fb87f0044d753472c2ec9e2d1745 (diff)
downloadmeta-fsl-arm-8af144a9f5a26dcd9c999e97374f19bdb618590d.tar.gz
meta-fsl-arm-8af144a9f5a26dcd9c999e97374f19bdb618590d.tar.bz2
meta-fsl-arm-8af144a9f5a26dcd9c999e97374f19bdb618590d.zip
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>
-rw-r--r--conf/machine/imx31pdk.conf2
-rw-r--r--conf/machine/imx35pdk.conf2
-rw-r--r--conf/machine/include/imx-base.inc1
3 files changed, 1 insertions, 4 deletions
diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf
index 3aa6606..9ae6245 100644
--- a/conf/machine/imx31pdk.conf
+++ b/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/conf/machine/imx35pdk.conf b/conf/machine/imx35pdk.conf
index 2d48699..86566f2 100644
--- a/conf/machine/imx35pdk.conf
+++ b/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/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index d08c5f8..88a4d06 100644
--- a/conf/machine/include/imx-base.inc
+++ b/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"