diff options
author | Josh Wu <josh.wu@atmel.com> | 2013-02-18 15:25:30 +0800 |
---|---|---|
committer | Josh Wu <josh.wu@atmel.com> | 2013-02-18 18:24:53 +0800 |
commit | 7fe5aa3d398f35ffa87e258d0c0dc950ff75a6be (patch) | |
tree | 5434545deb631057c506c12a613ab66e9387231b /arch | |
parent | 55eba57334f0400fac87404904c7a8b99c56f595 (diff) |
sama5: use correct soc and board names: sama5d3 for soc name, sama5d3xek for board name.
In this patch, we
1. change the soc file and board directory to correct name.
2. change the macro name from CONFIG_AT91SAMA5 to CONFIG_SAMA5D3.
3. change the defconfig name to sama5d3xek_xxx.
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv7/at91/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/at91/sama5d3_devices.c (renamed from arch/arm/cpu/armv7/at91/at91sama5_devices.c) | 2 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-at91/hardware.h | 4 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-at91/sama5d3.h (renamed from arch/arm/include/asm/arch-at91/at91sama5.h) | 10 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-at91/sama5d3_smc.h (renamed from arch/arm/include/asm/arch-at91/at91sama5_smc.h) | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/cpu/armv7/at91/Makefile b/arch/arm/cpu/armv7/at91/Makefile index 5ad88b395e9..a4d29bf906c 100644 --- a/arch/arm/cpu/armv7/at91/Makefile +++ b/arch/arm/cpu/armv7/at91/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o -COBJS-$(CONFIG_AT91SAMA5) += at91sama5_devices.o +COBJS-$(CONFIG_SAMA5D3) += sama5d3_devices.o COBJS-y += clock.o COBJS-y += cpu.o COBJS-y += reset.o diff --git a/arch/arm/cpu/armv7/at91/at91sama5_devices.c b/arch/arm/cpu/armv7/at91/sama5d3_devices.c index 6104d214b4b..bd6a70b6cdc 100644 --- a/arch/arm/cpu/armv7/at91/at91sama5_devices.c +++ b/arch/arm/cpu/armv7/at91/sama5d3_devices.c @@ -21,7 +21,7 @@ */ #include <common.h> -#include <asm/arch/at91sama5.h> +#include <asm/arch/sama5d3.h> #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/clk.h> diff --git a/arch/arm/include/asm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h index dac322da1ef..6dfab9c36e4 100644 --- a/arch/arm/include/asm/arch-at91/hardware.h +++ b/arch/arm/include/asm/arch-at91/hardware.h @@ -39,8 +39,8 @@ # include <asm/arch/at91sam9g45.h> #elif defined(CONFIG_AT91SAM9X5) # include <asm/arch/at91sam9x5.h> -#elif defined(CONFIG_AT91SAMA5) -# include <asm/arch/at91sama5.h> +#elif defined(CONFIG_SAMA5D3) +# include <asm/arch/sama5d3.h> #elif defined(CONFIG_AT91CAP9) # include <asm/arch/at91cap9.h> #elif defined(CONFIG_AT91X40) diff --git a/arch/arm/include/asm/arch-at91/at91sama5.h b/arch/arm/include/asm/arch-at91/sama5d3.h index f6944312206..27dfffc895b 100644 --- a/arch/arm/include/asm/arch-at91/at91sama5.h +++ b/arch/arm/include/asm/arch-at91/sama5d3.h @@ -1,10 +1,10 @@ /* - * Chip-specific header file for the AT91SAMA5 family + * Chip-specific header file for the SAMA5D3 family * * (C) 2012 Atmel Corporation. * * Definitions for the SoC: - * AT91SAMA5 + * SAMA5D3 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -12,8 +12,8 @@ * (at your option) any later version. */ -#ifndef AT91SAMA5_H -#define AT91SAMA5_H +#ifndef SAMA5D3_H +#define SAMA5D3_H /* * defines to be used in other places @@ -205,7 +205,7 @@ #define CONFIG_SYS_AT91_UNKNOWN_CPU "Unknown CPU type" /* - * AT91SAMA5 specific prototypes + * SAMA5D3 specific prototypes */ #ifndef __ASSEMBLY__ unsigned int get_chip_id(void); diff --git a/arch/arm/include/asm/arch-at91/at91sama5_smc.h b/arch/arm/include/asm/arch-at91/sama5d3_smc.h index 22370e0b8f6..b09dc1c06d9 100644 --- a/arch/arm/include/asm/arch-at91/at91sama5_smc.h +++ b/arch/arm/include/asm/arch-at91/sama5d3_smc.h @@ -2,7 +2,7 @@ * Copyright (C) 2012 Atmel Corporation. * * Static Memory Controllers (SMC) - System peripherals registers. - * Based on AT91SAMA5 datasheet. + * Based on SAMA5D3 datasheet. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -10,8 +10,8 @@ * (at your option) any later version. */ -#ifndef AT91SAMA5_SMC_H -#define AT91SAMA5_SMC_H +#ifndef SAMA5D3_SMC_H +#define SAMA5D3_SMC_H #ifdef __ASSEMBLY__ |