From c8e7ddd4c6d0e195fa2f28c534f5c8233547c59e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20Bie=C3=9Fmann?= <biessmann@corscience.de>
Date: Wed, 9 Feb 2011 04:10:30 +0000
Subject: [PATCH] avr32: fix linking
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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 insertion(+), 6 deletions(-)

diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk
index 9488c49132..ef147105b7 100644
--- a/arch/avr32/config.mk
+++ b/arch/avr32/config.mk
@@ -26,4 +26,4 @@ CROSS_COMPILE ?= avr32-linux-
 CONFIG_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 ea76d05df8..c3c7433214 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 284f7ff32e..455b0d5e8b 100644
--- a/board/atmel/atstk1000/config.mk
+++ b/board/atmel/atstk1000/config.mk
@@ -1,3 +1,2 @@
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
-PLATFORM_LDFLAGS	+= --gc-sections
 CONFIG_SYS_TEXT_BASE		= 0x00000000
diff --git a/board/earthlcd/favr-32-ezkit/config.mk b/board/earthlcd/favr-32-ezkit/config.mk
index 284f7ff32e..455b0d5e8b 100644
--- a/board/earthlcd/favr-32-ezkit/config.mk
+++ b/board/earthlcd/favr-32-ezkit/config.mk
@@ -1,3 +1,2 @@
 PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
-PLATFORM_LDFLAGS	+= --gc-sections
 CONFIG_SYS_TEXT_BASE		= 0x00000000
diff --git a/board/mimc/mimc200/config.mk b/board/mimc/mimc200/config.mk
index ea76d05df8..c3c7433214 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 ea76d05df8..c3c7433214 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
-- 
2.39.5