From cac0172389688b861d269eb4f1fee679d21a1372 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Tue, 27 Jan 2015 16:41:55 +0100 Subject: [PATCH] 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 --- arch/arm/mach-at91/Makefile | 11 +++-------- .../arm/mach-at91/{board-dt-rm9200.c => at91rm9200.c} | 2 +- arch/arm/mach-at91/{board-dt-sam9.c => at91sam9.c} | 2 +- arch/arm/mach-at91/{board-dt-sama5.c => sama5.c} | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) rename arch/arm/mach-at91/{board-dt-rm9200.c => at91rm9200.c} (95%) rename arch/arm/mach-at91/{board-dt-sam9.c => at91sam9.c} (96%) rename arch/arm/mach-at91/{board-dt-sama5.c => sama5.c} (97%) 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 obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o # CPU-specific support -obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200_time.o - -# AT91SAM board with device-tree -obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o -obj-$(CONFIG_SOC_AT91SAM9) += board-dt-sam9.o - -# SAMA5 board with device-tree -obj-$(CONFIG_SOC_SAMA5) += board-dt-sama5.o +obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o +obj-$(CONFIG_SOC_AT91SAM9) += at91sam9.o +obj-$(CONFIG_SOC_SAMA5) += sama5.o # Power Management obj-$(CONFIG_PM) += pm.o diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/at91rm9200.c similarity index 95% rename from arch/arm/mach-at91/board-dt-rm9200.c rename to 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 @@ /* - * Setup code for AT91RM9200 Evaluation Kits with Device Tree support + * Setup code for AT91RM9200 * * Copyright (C) 2011 Atmel, * 2011 Nicolas Ferre diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/at91sam9.c similarity index 96% rename from arch/arm/mach-at91/board-dt-sam9.c rename to 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 @@ /* - * Setup code for AT91SAM Evaluation Kits with Device Tree support + * Setup code for AT91SAM9 * * Copyright (C) 2011 Atmel, * 2011 Nicolas Ferre diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/sama5.c similarity index 97% rename from arch/arm/mach-at91/board-dt-sama5.c rename to 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 @@ /* - * Setup code for SAMA5 Evaluation Kits with Device Tree support + * Setup code for SAMA5 * * Copyright (C) 2013 Atmel, * 2013 Ludovic Desroches -- 2.34.1