summaryrefslogtreecommitdiff
path: root/board/emk
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-03-27 21:20:29 +0200
committerWolfgang Denk <wd@denx.de>2011-03-27 21:20:29 +0200
commitc04bf5e9a45d7335681352faa125193258f8e976 (patch)
treeab512a5a8356b6f492100925acb63638a7c10ce9 /board/emk
parentb0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff)
parent05858736f5f1050d776571451995db81e3f5a5d7 (diff)
downloadu-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.zip
u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.gz
u-boot-imx-c04bf5e9a45d7335681352faa125193258f8e976.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/emk')
-rw-r--r--board/emk/top860/u-boot.lds2
-rw-r--r--board/emk/top860/u-boot.lds.debug2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/emk/top860/u-boot.lds b/board/emk/top860/u-boot.lds
index ae1a791..32dcbd3 100644
--- a/board/emk/top860/u-boot.lds
+++ b/board/emk/top860/u-boot.lds
@@ -91,6 +91,6 @@ SECTIONS
*(COMMON)
. = ALIGN(4);
}
- _end = . ;
+ __bss_end__ = . ;
PROVIDE (end = .);
}
diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug
index 0f536f3..39807d4 100644
--- a/board/emk/top860/u-boot.lds.debug
+++ b/board/emk/top860/u-boot.lds.debug
@@ -126,6 +126,6 @@ SECTIONS
*(.bss)
*(COMMON)
}
- _end = . ;
+ __bss_end__ = . ;
PROVIDE (end = .);
}