diff options
author | Tom Rini <trini@ti.com> | 2012-12-17 18:39:50 -0700 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2012-12-17 18:39:50 -0700 |
commit | 095728803eedfce850a2f85828f79500cb09979e (patch) | |
tree | c226054297c0d3c82b112f1e45af121214b30a87 /include/configs/CRAYL1.h | |
parent | e80e588bb8db254fd939f83116ccf901bd233066 (diff) | |
parent | e3bb3254f8c055767edd1f02e642bec386540f4c (diff) | |
download | u-boot-imx-095728803eedfce850a2f85828f79500cb09979e.zip u-boot-imx-095728803eedfce850a2f85828f79500cb09979e.tar.gz u-boot-imx-095728803eedfce850a2f85828f79500cb09979e.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include/configs/CRAYL1.h')
-rw-r--r-- | include/configs/CRAYL1.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index 1daec69..6bceccb 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -153,7 +153,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x100000 /* where to load what we get from TFTP */ -#define CONFIG_SYS_TFTP_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_EXTBDINFO 1 /* To use extended board_into (bd_t) */ #define CONFIG_SYS_DRAM_TEST 1 |