diff options
Diffstat (limited to 'arch/arm/lib/board.c')
| -rw-r--r-- | arch/arm/lib/board.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index c6a12463e0..43b3733087 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -87,8 +87,8 @@ extern void rtl8019_get_enetaddr (uchar * addr); #include <i2c.h> #endif -#ifdef CONFIG_COLIBRI_T20 -extern void tegra_partition_init(void); +#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) +extern void tegra_partition_init(int boot_type); #endif @@ -598,15 +598,25 @@ void board_init_r (gd_t *id, ulong dest_addr) onenand_init(); #endif -#ifdef CONFIG_COLIBRI_T20 - tegra_partition_init(); -#endif - #ifdef CONFIG_GENERIC_MMC puts("MMC: "); mmc_initialize(bd); #endif +#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) + tegra_partition_init( +#ifdef CONFIG_COLIBRI_T20 +#ifndef CONFIG_ENV_IS_IN_MMC + 0 +#else /* !CONFIG_ENV_IS_IN_MMC */ + 1 +#endif /* !CONFIG_ENV_IS_IN_MMC */ +#else /* CONFIG_COLIBRI_T20 */ + 2 +#endif /* CONFIG_COLIBRI_T20 */ + ); +#endif /* CONFIG_COLIBRI_T20 | CONFIG_COLIBRI_T30 */ + #ifdef CONFIG_HAS_DATAFLASH AT91F_DataflashInit(); dataflash_print_info(); |