Patchwork [U-Boot] MPC8260: Fix compile problems with "hymod" board

login
register
mail settings
Submitter Wolfgang Denk
Date May 1, 2011, 2:35 p.m.
Message ID <1304260506-1456-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/93550/
State Accepted
Commit 9e2b51763704e32bc2556c87bf31fbdca7a53347
Headers show

Comments

Wolfgang Denk - May 1, 2011, 2:35 p.m.
Commit 9d8fbd1 "powerpc, 8xx: Fixup all 8xx u-boot.lds scripts" broke
building of the MPC8260 based "hymod" board.  Fix this.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Murray Jensen <Murray.Jensen@csiro.au>
Cc: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
---
 board/hymod/u-boot.lds |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Joakim - how comes that a patch that is declared to affect 8xx boards
only also modifies (and breaks!) a 82xx board??

Murray - can you please verify that the fix actually works on your
hardware?
Joakim Tjernlund - May 1, 2011, 5:21 p.m.
Wolfgang Denk <wd@denx.de> wrote on 2011/05/01 16:35:06:
>
> Commit 9d8fbd1 "powerpc, 8xx: Fixup all 8xx u-boot.lds scripts" broke
> building of the MPC8260 based "hymod" board.  Fix this.
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Murray Jensen <Murray.Jensen@csiro.au>
> Cc: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> ---
>  board/hymod/u-boot.lds |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> Joakim - how comes that a patch that is declared to affect 8xx boards
> only also modifies (and breaks!) a 82xx board??

The change was done with grep/simple script so it must have "missed" this.
Anyway, your patch looks good.

 Jocke

>
> Murray - can you please verify that the fix actually works on your
> hardware?
>
> diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
> index 1efa8b3..1309f20 100644
> --- a/board/hymod/u-boot.lds
> +++ b/board/hymod/u-boot.lds
> @@ -87,9 +87,10 @@ SECTIONS
>    PROVIDE (erotext = .);
>    .reloc   :
>    {
> -    *(.got)
>      _GOT2_TABLE_ = .;
> -    *(.got2)
> +    KEEP(*(.got2))
> +    KEEP(*(.got))
> +    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
>      _FIXUP_TABLE_ = .;
>      *(.fixup)
>    }
> --
> 1.7.4.4
>
Wolfgang Denk - May 12, 2011, 5:31 p.m.
Dear Wolfgang Denk,

In message <1304260506-1456-1-git-send-email-wd@denx.de> you wrote:
> Commit 9d8fbd1 "powerpc, 8xx: Fixup all 8xx u-boot.lds scripts" broke
> building of the MPC8260 based "hymod" board.  Fix this.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Murray Jensen <Murray.Jensen@csiro.au>
> Cc: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> ---
>  board/hymod/u-boot.lds |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)

applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/hymod/u-boot.lds b/board/hymod/u-boot.lds
index 1efa8b3..1309f20 100644
--- a/board/hymod/u-boot.lds
+++ b/board/hymod/u-boot.lds
@@ -87,9 +87,10 @@  SECTIONS
   PROVIDE (erotext = .);
   .reloc   :
   {
-    *(.got)
     _GOT2_TABLE_ = .;
-    *(.got2)
+    KEEP(*(.got2))
+    KEEP(*(.got))
+    PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
     _FIXUP_TABLE_ = .;
     *(.fixup)
   }