Merge branch 'master' of git://git.denx.de/u-boot-blackfin

[platform/kernel/u-boot.git] / lib_blackfin / u-boot.lds.S

diff --git a/lib_blackfin/u-boot.lds.S b/lib_blackfin/u-boot.lds.S
index 5ee8eb3..2b23d8b 100644 (file)
--- a/lib_blackfin/u-boot.lds.S
+++ b/lib_blackfin/u-boot.lds.S
@@ -1,7 +1,7 @@
 /*
  * U-boot - u-boot.lds.S
  *
- * Copyright (c) 2005-2008 Analog Device Inc.
+ * Copyright (c) 2005-2010 Analog Device Inc.
  *
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -29,7 +29,6 @@
 #include <asm/blackfin.h>
 #undef ALIGN
 #undef ENTRY
-#undef bfin
 
 #ifndef LDS_BOARD_TEXT
 # define LDS_BOARD_TEXT
@@ -95,13 +94,12 @@ SECTIONS
        {
                . = ALIGN(4);
                *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-               *(.eh_frame)
                . = ALIGN(4);
        } >ram_data
 
        .data :
        {
-               . = ALIGN(256);
+               . = ALIGN(4);
                *(.data .data.*)
                *(.data1)
                *(.sdata)