diff options
author | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:56:34 -0400 |
---|---|---|
committer | Justin Waters <justin.waters@timesys.com> | 2008-06-16 13:57:51 -0400 |
commit | 72e20f5704987c27e549c85706b125fd4bac02c7 (patch) | |
tree | c5a252708f5a4f6e04cd9390c5bd29b8bd48fda4 /include/asm-arm | |
parent | 405bb978ee2321b6cf5381a012c812bdc7679e40 (diff) | |
parent | 251484cfb845d5d54c652a1801270ede1521ca6d (diff) |
Merge branch 'u-boot-1.1.5-at91' into u-boot-1.3.0-at91
Conflicts:
include/configs/at91sam9261ek.h
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-at91sam926x/hardware.h | 2 | ||||
-rw-r--r-- | include/asm-arm/mach-types.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/asm-arm/arch-at91sam926x/hardware.h b/include/asm-arm/arch-at91sam926x/hardware.h index ff5b3246f2..044acd26fe 100644 --- a/include/asm-arm/arch-at91sam926x/hardware.h +++ b/include/asm-arm/arch-at91sam926x/hardware.h @@ -23,7 +23,7 @@ #include <asm/sizes.h> -#ifdef CONFIG_AT91SAM9260EK +#if defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AT91SAM9G20EK) #ifndef __ASSEMBLY__ #include <asm/arch/at91sam9260.h> #else diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h index 93f811b8fc..22d90523f7 100644 --- a/include/asm-arm/mach-types.h +++ b/include/asm-arm/mach-types.h @@ -742,6 +742,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_AT91RM9200DF 1119 #define MACH_TYPE_AT91SAM9263EK 1202 #define MACH_TYPE_AT91SAM9RLEK 1326 +#define MACH_TYPE_AT91SAM9G20EK 1624 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -9472,6 +9473,18 @@ extern unsigned int __machine_arch_type; # define machine_is_at91sam9rlek() (0) #endif +#ifdef CONFIG_MACH_AT91SAM9G20EK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AT91SAM9G20EK +# endif +# define machine_is_at91sam9g20ek() (machine_arch_type == MACH_TYPE_AT91SAM9G20EK) +#else +# define machine_is_at91sam9g20ek() (0) +#endif + /* * These have not yet been registered */ |