diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-05-09 02:04:53 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-05-09 02:04:53 +0200 |
| commit | 90f84a31dbd334e3264f4573c65f23db469571b0 (patch) | |
| tree | 29f763b46ded5a3b5fe2c60124aea04cc8be3104 /arch | |
| parent | f6862963315ecd20c45f71247a39c5cc30730cf6 (diff) | |
apalis_t30: initial integration
Add initial Apalis T30 support based off our current Colibri T30
implementation:
- Updated machine ID.
- USB host USBH2 and USBH3 support. Note: USBO1 support is currently broken.
- Updated MMC and SD card support.
- Adjusted available amount of memory.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 8 | ||||
| -rw-r--r-- | arch/arm/lib/board.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 87c6761326..fe78742f57 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -79,14 +79,16 @@ typedef struct global_data { const void *blob; /* Our device tree, NULL if none */ void **jt; /* jump table */ char env_buf[32]; /* buffer for getenv() before reloc. */ -#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) +#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) || \ + defined(CONFIG_APALIS_T30) unsigned conf_blk_offset; /* offset to Toradex config block */ unsigned env_offset; /* offset to U-Boot environment */ -#if (defined(CONFIG_ENV_IS_IN_MMC) && defined(CONFIG_COLIBRI_T20)) || defined(CONFIG_COLIBRI_T30) +#if (defined(CONFIG_ENV_IS_IN_MMC) && defined(CONFIG_COLIBRI_T20)) || \ + defined(CONFIG_COLIBRI_T30) || defined(CONFIG_APALIS_T30) unsigned gpt_offset; /* offset to GPT in mass storage */ #endif unsigned kernel_offset; /* offset to kernel in mass storage */ -#endif /* CONFIG_COLIBRI_T20 | CONFIG_COLIBRI_T30 */ +#endif /* CONFIG_COLIBRI_T20 | CONFIG_COLIBRI_T30 | CONFIG_APALIS_T30 */ } gd_t; /* diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 43b3733087..763513ec21 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -87,7 +87,8 @@ extern void rtl8019_get_enetaddr (uchar * addr); #include <i2c.h> #endif -#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) +#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) || \ + defined(CONFIG_APALIS_T30) extern void tegra_partition_init(int boot_type); #endif @@ -603,7 +604,8 @@ void board_init_r (gd_t *id, ulong dest_addr) mmc_initialize(bd); #endif -#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) +#if defined(CONFIG_COLIBRI_T20) || defined(CONFIG_COLIBRI_T30) || \ + defined(CONFIG_APALIS_T30) tegra_partition_init( #ifdef CONFIG_COLIBRI_T20 #ifndef CONFIG_ENV_IS_IN_MMC @@ -615,7 +617,7 @@ void board_init_r (gd_t *id, ulong dest_addr) 2 #endif /* CONFIG_COLIBRI_T20 */ ); -#endif /* CONFIG_COLIBRI_T20 | CONFIG_COLIBRI_T30 */ +#endif /* CONFIG_COLIBRI_T20 | CONFIG_COLIBRI_T30 | CONFIG_APALIS_T30 */ #ifdef CONFIG_HAS_DATAFLASH AT91F_DataflashInit(); |