diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-24 18:15:45 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-24 18:15:45 +0200 |
commit | 664eaa29bdd9ed3d8f8c00c91a262374b84ece09 (patch) | |
tree | 68465a76cc2b39143390a444050b8e2cce73fb9f | |
parent | 16a9368a88a28252ea1daedc1df03ccc49ea5b22 (diff) |
colibri_t30: fix build
Fix build issues introduced with NVIDIA partition table parsing
integration.
-rw-r--r-- | board/toradex/common/board.c | 11 |
1 files changed, 9 insertions, 2 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; } |