diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-08 00:37:27 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-08 00:37:27 +0100 |
| commit | 7ba6d591b5a6ec4ed502de7d94ff726bce13fe61 (patch) | |
| tree | bc671d9907e30d2fdf836fdc26de2f6572f0363e /board | |
| parent | 36a9a15b7ab251b65a55a87a13d66b7d968e1d77 (diff) | |
| parent | f3aed65339ad9644517d4e1e401eb850962d8408 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
* 'master' of git://git.denx.de/u-boot-coldfire:
ColdFire: The EB+MCF-EV123 boards config update
ColdFire: Fix the compile issue for M52277
ColdFire:Moving the remaining coldfire boards to boards.cfg
Diffstat (limited to 'board')
| -rw-r--r-- | board/BuS/EB+MCF-EV123/config.mk | 1 | ||||
| -rw-r--r-- | board/BuS/EB+MCF-EV123/textbase.mk | 1 | ||||
| -rw-r--r-- | board/freescale/m52277evb/u-boot.lds | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/board/BuS/EB+MCF-EV123/config.mk b/board/BuS/EB+MCF-EV123/config.mk index 50185aead6..18fb84eb3b 100644 --- a/board/BuS/EB+MCF-EV123/config.mk +++ b/board/BuS/EB+MCF-EV123/config.mk @@ -22,7 +22,6 @@ # MA 02111-1307 USA # -sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk ifndef CONFIG_SYS_TEXT_BASE CONFIG_SYS_TEXT_BASE = 0xFE000000 endif diff --git a/board/BuS/EB+MCF-EV123/textbase.mk b/board/BuS/EB+MCF-EV123/textbase.mk deleted file mode 100644 index b97c034b21..0000000000 --- a/board/BuS/EB+MCF-EV123/textbase.mk +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SYS_TEXT_BASE = 0xFFE00000 diff --git a/board/freescale/m52277evb/u-boot.lds b/board/freescale/m52277evb/u-boot.lds index e7b22e3fc3..3e9f4c3460 100644 --- a/board/freescale/m52277evb/u-boot.lds +++ b/board/freescale/m52277evb/u-boot.lds @@ -32,9 +32,6 @@ SECTIONS arch/m68k/cpu/mcf5227x/libmcf5227x.o (.text*) arch/m68k/lib/libm68k.o (.text*) - . = DEFINED(env_offset) ? env_offset : .; - common/env_embedded.o (.text*) - *(.text*) } _etext = .; |