summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-11-01 22:58:59 +0100
committerWolfgang Denk <wd@denx.de>2007-11-01 22:58:59 +0100
commit8287b3b5642c5157392e35b7277ea0c513da50b5 (patch)
tree4b36e629e7598b07547c45d7588ba518e8079851 /board
parentdbf331762374c2eae4b684fd4ed9308c249a8203 (diff)
parente8ee8f3ade2a06c1893dd5e68f223070d650c7ed (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
Diffstat (limited to 'board')
-rw-r--r--board/freescale/m54455evb/config.mk4
-rw-r--r--board/m5282evb/m5282evb.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/board/freescale/m54455evb/config.mk b/board/freescale/m54455evb/config.mk
index ce014edca..b42fcc94c 100644
--- a/board/freescale/m54455evb/config.mk
+++ b/board/freescale/m54455evb/config.mk
@@ -22,4 +22,6 @@
# MA 02111-1307 USA
#
-TEXT_BASE = 0
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
+
+PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE)
diff --git a/board/m5282evb/m5282evb.c b/board/m5282evb/m5282evb.c
index 243d6a4d8..7d6d1d623 100644
--- a/board/m5282evb/m5282evb.c
+++ b/board/m5282evb/m5282evb.c
@@ -89,4 +89,5 @@ long int initdram (int board_type)
/* Write to the SDRAM Mode Register */
*(u32 *)(CFG_SDRAM_BASE + 0x400) = 0xA5A59696;
}
+ return dramsize;
}