As the sama5d3 is a family member of sama5, so only check sama5 family. Signed-off-by: Bo Shen <voice.shen@xxxxxxxxx> --- arch/arm/mach-at91/include/mach/cpu.h | 2 +- arch/arm/mach-at91/setup.c | 2 +- arch/arm/mach-at91/soc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h index 0e213ce..c38260f 100644 --- a/arch/arm/mach-at91/include/mach/cpu.h +++ b/arch/arm/mach-at91/include/mach/cpu.h @@ -26,7 +26,7 @@ #define ARCH_ID_AT91SAM9G45ES 0x819b05a1 /* 9G45-ES (Engineering Sample) */ #define ARCH_ID_AT91SAM9X5 0x819a05a0 #define ARCH_ID_AT91SAM9N12 0x819a07a0 -#define ARCH_ID_SAMA5D3 0x8A5C07C0 +#define ARCH_ID_SAMA5 0x8A5C07C0 #define ARCH_ID_AT91SAM9XE128 0x329973a0 #define ARCH_ID_AT91SAM9XE256 0x329a93a0 diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 076d081..80dc277 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -89,7 +89,7 @@ static void __init soc_detect(u32 dbgu_base) at91_boot_soc = at91sam9n12_soc; break; - case ARCH_ID_SAMA5D3: + case ARCH_ID_SAMA5: at91_soc_initdata.type = AT91_SOC_SAMA5D3; at91_boot_soc = at91sama5d3_soc; break; diff --git a/arch/arm/mach-at91/soc.h b/arch/arm/mach-at91/soc.h index b2278a5..e548165 100644 --- a/arch/arm/mach-at91/soc.h +++ b/arch/arm/mach-at91/soc.h @@ -66,6 +66,6 @@ static inline int at91_soc_is_enabled(void) #define at91sam9n12_soc at91_boot_soc #endif -#if !defined(CONFIG_SOC_SAMA5) +#if !defined(CONFIG_ARCH_SAMA5D3) #define at91sama5d3_soc at91_boot_soc #endif -- 2.1.0.24.g4109c28 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
