Patchwork [U-Boot,2/3] avr32: fix linking

login
register
mail settings
Submitter Andreas Bießmann
Date Feb. 9, 2011, 2:10 p.m.
Message ID <1297260631-13864-3-git-send-email-biessmann@corscience.de>
Download mbox | patch
Permalink /patch/82467/
State Accepted
Delegated to: Reinhard Meyer
Headers show

Comments

Andreas Bießmann - Feb. 9, 2011, 2:10 p.m.
This patch fixes following error:

---8<---
avr32-linux-ld: --gc-sections and -r may not be used together
--->8---

Since 8aba9dceebb14144e07d19593111ee3a999c37fc all avr32 boards are broken due
to linking error as seen above.

Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
---
 arch/avr32/config.mk                   |    2 +-
 board/atmel/atngw100/config.mk         |    1 -
 board/atmel/atstk1000/config.mk        |    1 -
 board/earthlcd/favr-32-ezkit/config.mk |    1 -
 board/mimc/mimc200/config.mk           |    1 -
 board/miromico/hammerhead/config.mk    |    1 -
 6 files changed, 1 insertions(+), 6 deletions(-)
Reinhard Meyer - April 18, 2011, 10:53 a.m.
Dear Andreas Bießmann:
> This patch fixes following error:
> 
> ---8<---
> avr32-linux-ld: --gc-sections and -r may not be used together
> --->8---
> 
> Since 8aba9dceebb14144e07d19593111ee3a999c37fc all avr32 boards are broken due
> to linking error as seen above.
> 
> Signed-off-by: Andreas Bießmann <biessmann@corscience.de>
> ---
>  arch/avr32/config.mk                   |    2 +-
>  board/atmel/atngw100/config.mk         |    1 -
>  board/atmel/atstk1000/config.mk        |    1 -
>  board/earthlcd/favr-32-ezkit/config.mk |    1 -
>  board/mimc/mimc200/config.mk           |    1 -
>  board/miromico/hammerhead/config.mk    |    1 -
>  6 files changed, 1 insertions(+), 6 deletions(-)
Applied to u-boot-atmel/next, thanks.

Reinhard

Patch

diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk
index 1121ca1..51b9995 100644
--- a/arch/avr32/config.mk
+++ b/arch/avr32/config.mk
@@ -26,4 +26,4 @@  CROSS_COMPILE ?= avr32-linux-
 STANDALONE_LOAD_ADDR = 0x00000000
 
 PLATFORM_RELFLAGS	+= -ffixed-r5 -fPIC -mno-init-got -mrelax
-PLATFORM_LDFLAGS	+= --relax
+LDFLAGS_u-boot		= --gc-sections --relax
diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk
index ea76d05..c3c7433 100644
--- a/board/atmel/atngw100/config.mk
+++ b/board/atmel/atngw100/config.mk
@@ -1,3 +1,2 @@ 
 CONFIG_SYS_TEXT_BASE		= 0x00000000
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
-PLATFORM_LDFLAGS	+= --gc-sections
diff --git a/board/atmel/atstk1000/config.mk b/board/atmel/atstk1000/config.mk
index 8c03b77..bec7b7d 100644
--- a/board/atmel/atstk1000/config.mk
+++ b/board/atmel/atstk1000/config.mk
@@ -1,4 +1,3 @@ 
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
-PLATFORM_LDFLAGS	+= --gc-sections
 CONFIG_SYS_TEXT_BASE		= 0x00000000
 LDSCRIPT		= $(src)board/atmel/atstk1000/u-boot.lds
diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk
index f8bc88d..eb607ee 100644
--- a/board/earthlcd/favr-32-ezkit/config.mk
+++ b/board/earthlcd/favr-32-ezkit/config.mk
@@ -1,4 +1,3 @@ 
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
-PLATFORM_LDFLAGS	+= --gc-sections
 CONFIG_SYS_TEXT_BASE		= 0x00000000
 LDSCRIPT		= $(src)board/earthlcd/favr-32-ezkit/u-boot.lds
diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk
index ea76d05..c3c7433 100644
--- a/board/mimc/mimc200/config.mk
+++ b/board/mimc/mimc200/config.mk
@@ -1,3 +1,2 @@ 
 CONFIG_SYS_TEXT_BASE		= 0x00000000
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
-PLATFORM_LDFLAGS	+= --gc-sections
diff --git a/board/miromico/hammerhead/config.mk b/board/miromico/hammerhead/config.mk
index ea76d05..c3c7433 100644
--- a/board/miromico/hammerhead/config.mk
+++ b/board/miromico/hammerhead/config.mk
@@ -1,3 +1,2 @@ 
 CONFIG_SYS_TEXT_BASE		= 0x00000000
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
-PLATFORM_LDFLAGS	+= --gc-sections