diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-13 20:59:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-13 20:59:47 +0200 |
| commit | e1b4c57096b87b4ada56df4154d9acee6a59141f (patch) | |
| tree | 4d1ab61fd347a63410bcffc1ac2d85beeb247058 /include/configs/tx25.h | |
| parent | da61f6c45ad4a126bf0a9a8184fadc13073ecb3f (diff) | |
| parent | 89bca0ab697fc75160dd0d685d7cb2ed26609a6d (diff) | |
| download | u-boot-e1b4c57096b87b4ada56df4154d9acee6a59141f.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/tx25.h')
| -rw-r--r-- | include/configs/tx25.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/tx25.h b/include/configs/tx25.h index c798570aec..bcc8140df0 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -176,8 +176,7 @@ "update=nand erase 0 40000;nand write ${loadaddr} 0 40000\0" \ "upd=run load update\0" \ -/* additions for new relocation code, must added to all boards */ -#undef CONFIG_SYS_ARM_WITHOUT_RELOC /* This board is tested with relocation support */ +/* additions for new relocation code, must be added to all boards */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \ CONFIG_SYS_GBL_DATA_SIZE) |