diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:34:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:34:16 +0200 |
| commit | 0cc89de8ef60214083739904b011f6c255922723 (patch) | |
| tree | 17adeeae646a93fb7ee1e331915123cd8814a6df /board/socrates/config.mk | |
| parent | 6561863678822847be92c3bd06ae1d64acca4f6a (diff) | |
| parent | 07517e7f4f582d1607adbc444bab75af3ac4a7f9 (diff) | |
| download | u-boot-imx-0cc89de8ef60214083739904b011f6c255922723.zip u-boot-imx-0cc89de8ef60214083739904b011f6c255922723.tar.gz u-boot-imx-0cc89de8ef60214083739904b011f6c255922723.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'board/socrates/config.mk')
| -rw-r--r-- | board/socrates/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/socrates/config.mk b/board/socrates/config.mk index 4f17294..7ea37b5 100644 --- a/board/socrates/config.mk +++ b/board/socrates/config.mk @@ -26,4 +26,4 @@ # socrates board # default CCARBAR is at 0xff700000 # -TEXT_BASE = 0xfffa0000 +TEXT_BASE = 0xfff80000 |