diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-01-27 10:41:55 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-02-02 05:01:28 -0500 |
commit | cac0172389688b861d269eb4f1fee679d21a1372 (patch) | |
tree | afdaea62610ff681571aaeee2a709ed22a4aa450 | |
parent | edd942247fe69b0488e6dc2da97f415b3bc09545 (diff) |
ARM: at91: change board files into SoC files
As board files are now DT only and can address all aspects of the SoC family,
we can rename them so that the mach-at91 directory looks cleaner.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/Makefile | 11 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91rm9200.c (renamed from arch/arm/mach-at91/board-dt-rm9200.c) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9.c (renamed from arch/arm/mach-at91/board-dt-sam9.c) | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/sama5.c (renamed from arch/arm/mach-at91/board-dt-sama5.c) | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 3362f51ffd82..827fdbcce1c7 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
@@ -7,14 +7,9 @@ obj-y := setup.o | |||
7 | obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o | 7 | obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o |
8 | 8 | ||
9 | # CPU-specific support | 9 | # CPU-specific support |
10 | obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200_time.o | 10 | obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o |
11 | 11 | obj-$(CONFIG_SOC_AT91SAM9) += at91sam9.o | |
12 | # AT91SAM board with device-tree | 12 | obj-$(CONFIG_SOC_SAMA5) += sama5.o |
13 | obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o | ||
14 | obj-$(CONFIG_SOC_AT91SAM9) += board-dt-sam9.o | ||
15 | |||
16 | # SAMA5 board with device-tree | ||
17 | obj-$(CONFIG_SOC_SAMA5) += board-dt-sama5.o | ||
18 | 13 | ||
19 | # Power Management | 14 | # Power Management |
20 | obj-$(CONFIG_PM) += pm.o | 15 | obj-$(CONFIG_PM) += pm.o |
diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 5fcd1c73ece0..ec89806c9d5d 100644 --- a/arch/arm/mach-at91/board-dt-rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Setup code for AT91RM9200 Evaluation Kits with Device Tree support | 2 | * Setup code for AT91RM9200 |
3 | * | 3 | * |
4 | * Copyright (C) 2011 Atmel, | 4 | * Copyright (C) 2011 Atmel, |
5 | * 2011 Nicolas Ferre <nicolas.ferre@atmel.com> | 5 | * 2011 Nicolas Ferre <nicolas.ferre@atmel.com> |
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/at91sam9.c index f5d922e57655..04a9af79aadb 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/at91sam9.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Setup code for AT91SAM Evaluation Kits with Device Tree support | 2 | * Setup code for AT91SAM9 |
3 | * | 3 | * |
4 | * Copyright (C) 2011 Atmel, | 4 | * Copyright (C) 2011 Atmel, |
5 | * 2011 Nicolas Ferre <nicolas.ferre@atmel.com> | 5 | * 2011 Nicolas Ferre <nicolas.ferre@atmel.com> |
diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/sama5.c index f9a1b0261f72..22944d7e1a63 100644 --- a/arch/arm/mach-at91/board-dt-sama5.c +++ b/arch/arm/mach-at91/sama5.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Setup code for SAMA5 Evaluation Kits with Device Tree support | 2 | * Setup code for SAMA5 |
3 | * | 3 | * |
4 | * Copyright (C) 2013 Atmel, | 4 | * Copyright (C) 2013 Atmel, |
5 | * 2013 Ludovic Desroches <ludovic.desroches@atmel.com> | 5 | * 2013 Ludovic Desroches <ludovic.desroches@atmel.com> |