diff options
author | Wolfgang Denk <wd@denx.de> | 2007-11-02 15:09:10 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-11-02 15:09:10 +0100 |
commit | f0516920f6e048425b005c049378e80d600bd268 (patch) | |
tree | 8038bb6bc203daf2ad4a9aa4d2e246f10f12a7c1 /board | |
parent | 5b746c3ea8c72035621435853d5b5278af0a1011 (diff) | |
parent | 8b6684a698500be9c142ec2c9f46cfc348e17f0c (diff) | |
download | bootable_bootloader_goldelico_gta04-f0516920f6e048425b005c049378e80d600bd268.zip bootable_bootloader_goldelico_gta04-f0516920f6e048425b005c049378e80d600bd268.tar.gz bootable_bootloader_goldelico_gta04-f0516920f6e048425b005c049378e80d600bd268.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board')
-rw-r--r-- | board/freescale/m54455evb/config.mk | 4 | ||||
-rw-r--r-- | board/m5282evb/m5282evb.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/board/freescale/m54455evb/config.mk b/board/freescale/m54455evb/config.mk index ce014ed..b42fcc9 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 243d6a4..7d6d1d6 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; } |