diff options
author | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 |
commit | cd77dd109c4a439519a78c32eddc42bdebc7a61f (patch) | |
tree | c5534647cb1786044ef0f7e4ad4067725eddf11d /board/ip860 | |
parent | 95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff) | |
parent | afc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff) | |
download | u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.gz u-boot-imx-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.bz2 |
Merge branch 'reloc'
Diffstat (limited to 'board/ip860')
-rw-r--r-- | board/ip860/u-boot.lds | 1 | ||||
-rw-r--r-- | board/ip860/u-boot.lds.debug | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/board/ip860/u-boot.lds b/board/ip860/u-boot.lds index b47ae8e..a786bf2 100644 --- a/board/ip860/u-boot.lds +++ b/board/ip860/u-boot.lds @@ -66,7 +66,6 @@ SECTIONS common/env_embedded.o(.text) **/ *(.text) - *(.fixup) *(.got1) } _etext = .; diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug index e8a47f7..dc2f6e1 100644 --- a/board/ip860/u-boot.lds.debug +++ b/board/ip860/u-boot.lds.debug @@ -65,7 +65,6 @@ SECTIONS common/env_embedded.o(.text) **/ *(.text) - *(.fixup) *(.got1) } _etext = .; |