Patchwork [v2,2/3,meta-fsl-arm] imx-base.inc: Place UBOOT_ENTRYPOINT into common location

login
register
mail settings
Submitter Fabio Estevam
Date April 18, 2013, 2:15 p.m.
Message ID <1366294515-4647-2-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/48495/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Fabio Estevam - April 18, 2013, 2:15 p.m.
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>
---
Changes since v1:
- Newly introduced

 conf/machine/imx31pdk.conf        |    2 --
 conf/machine/imx35pdk.conf        |    2 --
 conf/machine/include/imx-base.inc |    1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

Patch

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"