diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/ssv/adnpesc1/config.mk | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/ssv/adnpesc1/config.mk')
| -rw-r--r-- | board/ssv/adnpesc1/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/ssv/adnpesc1/config.mk b/board/ssv/adnpesc1/config.mk index 7d8eb03..cf05445 100644 --- a/board/ssv/adnpesc1/config.mk +++ b/board/ssv/adnpesc1/config.mk @@ -22,7 +22,7 @@ # MA 02111-1307 USA # -TEXT_BASE = 0x02fc0000 # ATTENTION: notice your CFG_MONITOR_LEN setting +TEXT_BASE = 0x02fc0000 # ATTENTION: notice your CONFIG_SYS_MONITOR_LEN setting ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG |