diff options
| author | Tom Rini <trini@ti.com> | 2014-10-23 14:05:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-23 14:05:34 -0400 |
| commit | 03a3536c7b7f2902932606da9248c6f08318174a (patch) | |
| tree | 414815bd812360c88c338416f5bb6c67ed7ba75d /arch/arm/include/asm/mach-types.h | |
| parent | 7bfd5ee1170eca10d26858b6b2ed36317cc686fd (diff) | |
| parent | 9aafef4f360616a507578b8868092f096b093aa9 (diff) | |
| download | blackbird-obmc-uboot-03a3536c7b7f2902932606da9248c6f08318174a.tar.gz blackbird-obmc-uboot-03a3536c7b7f2902932606da9248c6f08318174a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'arch/arm/include/asm/mach-types.h')
| -rw-r--r-- | arch/arm/include/asm/mach-types.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 560924e83f..d4a447b2b8 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1107,6 +1107,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_ARMADILLO_800EVA 3863 #define MACH_TYPE_KZM9G 4140 #define MACH_TYPE_COLIBRI_T30 4493 +#define MACH_TYPE_APALIS_T30 4513 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -14248,6 +14249,18 @@ extern unsigned int __machine_arch_type; # define machine_is_colibri_t30() (0) #endif +#ifdef CONFIG_MACH_APALIS_T30 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_APALIS_T30 +# endif +# define machine_is_apalis_t30() (machine_arch_type == MACH_TYPE_APALIS_T30) +#else +# define machine_is_apalis_t30() (0) +#endif + /* * These have not yet been registered */ |
