Patchwork [meta-fsl-arm] Fix UBOOT_ENTRYPOINT

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

Comments

Fabio Estevam - April 18, 2013, 1:49 p.m.
The recommended entry points for generating a uImage are the ones listed
in the zreladdr line of the kernel Makefile.boot file:

(arch/arm/mach-<soc>/Makefile.boot)

While at it, 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>
---
 conf/machine/imx31pdk.conf        |    2 --
 conf/machine/imx35pdk.conf        |    2 --
 conf/machine/include/imx-base.inc |    9 +++++----
 conf/machine/include/mxs-base.inc |    3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)
Otavio Salvador - April 18, 2013, 1:57 p.m.
On Thu, Apr 18, 2013 at 10:49 AM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> The recommended entry points for generating a uImage are the ones listed
> in the zreladdr line of the kernel Makefile.boot file:
>
> (arch/arm/mach-<soc>/Makefile.boot)
>
> While at it, 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>
> ---
>  conf/machine/imx31pdk.conf        |    2 --
>  conf/machine/imx35pdk.conf        |    2 --
>  conf/machine/include/imx-base.inc |    9 +++++----
>  conf/machine/include/mxs-base.inc |    3 +--
>  4 files changed, 6 insertions(+), 10 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"

Those two changes should be done in a separated patch.

> diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
> index c761626..33c95e5 100644
> --- a/conf/machine/include/imx-base.inc
> +++ b/conf/machine/include/imx-base.inc
> @@ -13,10 +13,11 @@ PERF_FEATURES_ENABLE = ""
>  UBOOT_MAKE_TARGET = "u-boot.imx"
>  UBOOT_SUFFIX ?= "imx"
>
> -UBOOT_ENTRYPOINT_mx51  = "0xa0000000"
> -UBOOT_ENTRYPOINT_mx53  = "0x70800000"
> -UBOOT_ENTRYPOINT_mx6  = "0x10800000"
> -UBOOT_ENTRYPOINT_mx6sl = "0x80800000"
> +UBOOT_ENTRYPOINT_mx51  = "0x90008000"
> +UBOOT_ENTRYPOINT_mx53  = "0x70008000"
> +UBOOT_ENTRYPOINT_mx6  = "0x10008000"
> +UBOOT_ENTRYPOINT_mx6sl = "0x80008000"
> +UBOOT_ENTRYPOINT_mx3 = "0x80008000"

mx3 should be on top of it (ordered).

>  PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.11.4"
>
> diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
> index 6dc1302..68424e7 100644
> --- a/conf/machine/include/mxs-base.inc
> +++ b/conf/machine/include/mxs-base.inc
> @@ -9,8 +9,7 @@ include conf/machine/include/tune-arm926ejs.inc
>
>  SOC_FAMILY = "mxs"
>
> -UBOOT_ENTRYPOINT = "0x41008000"
> -UBOOT_LOADADDRESS = "0x41008000"
> +UBOOT_ENTRYPOINT = "0x40008000"

Please another patch for this.

>  UBOOT_MAKE_TARGET = "u-boot.sb"
>  UBOOT_SUFFIX = "sb"
>
> --
> 1.7.9.5
>
>



--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

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 c761626..33c95e5 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -13,10 +13,11 @@  PERF_FEATURES_ENABLE = ""
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX ?= "imx"
 
-UBOOT_ENTRYPOINT_mx51  = "0xa0000000"
-UBOOT_ENTRYPOINT_mx53  = "0x70800000"
-UBOOT_ENTRYPOINT_mx6  = "0x10800000"
-UBOOT_ENTRYPOINT_mx6sl = "0x80800000"
+UBOOT_ENTRYPOINT_mx51  = "0x90008000"
+UBOOT_ENTRYPOINT_mx53  = "0x70008000"
+UBOOT_ENTRYPOINT_mx6  = "0x10008000"
+UBOOT_ENTRYPOINT_mx6sl = "0x80008000"
+UBOOT_ENTRYPOINT_mx3 = "0x80008000"
 
 PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.11.4"
 
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index 6dc1302..68424e7 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -9,8 +9,7 @@  include conf/machine/include/tune-arm926ejs.inc
 
 SOC_FAMILY = "mxs"
 
-UBOOT_ENTRYPOINT = "0x41008000"
-UBOOT_LOADADDRESS = "0x41008000"
+UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_MAKE_TARGET = "u-boot.sb"
 UBOOT_SUFFIX = "sb"