diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:55:55 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:55:55 +0200 |
| commit | 4615fc22e539a2f7dae971701c05f09e21c1ca25 (patch) | |
| tree | 21521ea036a6339414051ba8fc37106fbcdcc1d3 /board/esd/dasa_sim/u-boot.lds | |
| parent | 16116ddd0d0158f4e91c91dc979b845b6e98a99d (diff) | |
| parent | 7deb3b3ecd0e81ef09bb68aa0ec2346f4ae0a405 (diff) | |
| download | u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.zip u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.gz u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts:
board/esd/dasa_sim/dasa_sim.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/esd/dasa_sim/u-boot.lds')
| -rw-r--r-- | board/esd/dasa_sim/u-boot.lds | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/board/esd/dasa_sim/u-boot.lds b/board/esd/dasa_sim/u-boot.lds index 67d72f7..6126b16 100644 --- a/board/esd/dasa_sim/u-boot.lds +++ b/board/esd/dasa_sim/u-boot.lds @@ -78,7 +78,6 @@ SECTIONS common/cmd_mem.o (.text) common/cmd_nvedit.o (.text) common/console.o (.text) - common/lists.o (.text) common/main.o (.text) board/esd/dasa_sim/flash.o (.text) |