From: Wolfgang Denk <wd@denx.de>
Date: Fri, 21 Oct 2011 21:36:40 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-coldfire
X-Git-Tag: v2011.12-rc1~511
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f82c087e60fe1c59ace1c6f016eb89c5d3c3ae13;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-coldfire

* 'master' of git://git.denx.de/u-boot-coldfire:
  ColdFire: Clean Makefile _config rules
  ColdFire: Move boards with simple _config rules to boards.cfg
  ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 defined
  ColdFire: Merge differentiated linking files into a sigle one by board
  ColdFire: Add $(obj) before cpu lib to correct build
  ColdFire: Cleanup lds files for multiple defined symbols
---

f82c087e60fe1c59ace1c6f016eb89c5d3c3ae13