diff options
| author | trdx <trdx@vm_one> | 2012-10-26 11:36:46 +0200 |
|---|---|---|
| committer | trdx <trdx@vm_one> | 2012-10-26 11:36:46 +0200 |
| commit | 5fbf30b36bd71f1af142f601a5871a2e6943acc5 (patch) | |
| tree | e0aa8971e27f28a20b0abc1dfe37d5025b7b0395 | |
| parent | 9d153e23d8fb6c5f60bf2fb4ee0730725b97eac3 (diff) | |
| parent | e0e076686a57328d75578f27f1927ae983a0b958 (diff) | |
Merge branch 'colibri' of git://git.toradex.com/u-boot-toradex.git into colibri
| -rw-r--r-- | board/toradex/common/board.c | 11 | ||||
| -rw-r--r-- | include/configs/colibri_t20.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/board/toradex/common/board.c b/board/toradex/common/board.c index ca817eeeb6c..2e6d61d907a 100644 --- a/board/toradex/common/board.c +++ b/board/toradex/common/board.c @@ -549,19 +549,24 @@ int board_early_init_f(void) #ifdef BOARD_LATE_INIT int board_late_init(void) { +#ifdef CONFIG_CMD_NAND char env_str[256 ]; +#endif + +#if defined(CONFIG_CMD_NAND) || defined(CONFIG_TRDX_CFG_BLOCK) + int i; +#endif #ifdef CONFIG_TRDX_CFG_BLOCK char *addr_str, *end; unsigned char bi_enetaddr[6] = {0, 0, 0, 0, 0, 0}; /* Ethernet address */ - int i; unsigned char *mac_addr; unsigned char mac_addr00[6] = {0, 0, 0, 0, 0, 0}; size_t size = 4096; unsigned char toradex_oui[3] = { 0x00, 0x14, 0x2d }; int valid = 0; - + int ret; #endif /* CONFIG_TRDX_CFG_BLOCK */ @@ -634,6 +639,7 @@ int board_late_init(void) #endif /* CONFIG_TRDX_CFG_BLOCK */ +#ifdef CONFIG_CMD_NAND /* set the nand kernel offset */ if (!getenv("lnxoffset")) { sprintf(env_str, "0x%x", (unsigned)(gd->kernel_offset)); @@ -648,6 +654,7 @@ int board_late_init(void) setenv("mtdparts", env_str); } +#endif /* CONFIG_CMD_NAND */ return 0; } diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 3888ac79b16..9635c8b2a16 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -142,7 +142,7 @@ "run setup; " \ "setenv bootargs ${defargs} ${sdargs} ${mtdparts} ${setupargs}; " \ "echo Booting from MMC/SD card...; " \ - "mmc read 0 ${loadaddr} 0x2a00 0x2000; " \ + "mmc read 0 ${loadaddr} 0x2a00 0x4000; " \ "bootm" #undef CONFIG_BOOTARGS |