diff options
author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
commit | 225f0eaa745adfae05931848543d99942798756a (patch) | |
tree | f5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /board/Marvell/db64460/u-boot.lds | |
parent | 6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff) | |
parent | afbc526336447a7357e9c82852df0377d09a8089 (diff) | |
download | u-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/Marvell/db64460/u-boot.lds')
-rw-r--r-- | board/Marvell/db64460/u-boot.lds | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/Marvell/db64460/u-boot.lds b/board/Marvell/db64460/u-boot.lds index 1a95755..b6b37ef 100644 --- a/board/Marvell/db64460/u-boot.lds +++ b/board/Marvell/db64460/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS /* store the environment in a seperate sector in the boot flash */ /* . = env_offset; */ -/* common/environment.o(.text) */ +/* common/env_embedded.o(.text) */ *(.text) *(.fixup) |