diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-24 17:08:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-24 17:08:31 +0200 |
| commit | d97370feca2a589dad42154577bb4615a0347852 (patch) | |
| tree | 5a3f85d24e07425977b7019017ae1615c0f12ce7 /board/stxgp3/u-boot.lds | |
| parent | 9fa48022e5883a0826a98979c0156f6ac5a0ef79 (diff) | |
| parent | 47a6989c10685d2ab3efcf95228ce50d2a496d3e (diff) | |
| download | u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.zip u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.tar.gz u-boot-imx-d97370feca2a589dad42154577bb4615a0347852.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
(Conflicts between Jon Loeliger's and Matthew McClintock's tree
were resolved by in favour of Jon's version.)
Diffstat (limited to 'board/stxgp3/u-boot.lds')
| -rw-r--r-- | board/stxgp3/u-boot.lds | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/board/stxgp3/u-boot.lds b/board/stxgp3/u-boot.lds index 3bc6150..1bbf20a 100644 --- a/board/stxgp3/u-boot.lds +++ b/board/stxgp3/u-boot.lds @@ -79,7 +79,6 @@ SECTIONS cpu/mpc85xx/cpu_init.o (.text) cpu/mpc85xx/cpu.o (.text) cpu/mpc85xx/speed.o (.text) - cpu/mpc85xx/i2c.o (.text) cpu/mpc85xx/spd_sdram.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) |