From c5330ae8c8169fa9e81e2f8f5db4a9388d0a89d6 Mon Sep 17 00:00:00 2001 From: Konstantin Porotchkin Date: Thu, 16 Feb 2017 13:52:22 +0200 Subject: [PATCH] arm64: mvebu: Rename the db-88f3720 to armada-37xx platform Modify the file names and deifinitions relater to Marvell db-77f3720 board support. Convert these names to more generic armada-37xx platform for future addition of more boards based on the same SoC family. Signed-off-by: Konstantin Porotchkin Cc: Stefan Roese Cc: Igal Liberman Cc: Nadav Haklai Signed-off-by: Stefan Roese --- arch/arm/mach-mvebu/Kconfig | 10 +++++----- .../MAINTAINERS | 4 ++-- .../{mvebu_db-88f3720 => mvebu_armada-37xx}/Makefile | 0 .../{mvebu_db-88f3720 => mvebu_armada-37xx}/board.c | 0 configs/mvebu_db-88f3720_defconfig | 2 +- .../{mvebu_db-88f3720.h => mvebu_armada-37xx.h} | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) rename board/Marvell/{mvebu_db-88f3720 => mvebu_armada-37xx}/MAINTAINERS (58%) rename board/Marvell/{mvebu_db-88f3720 => mvebu_armada-37xx}/Makefile (100%) rename board/Marvell/{mvebu_db-88f3720 => mvebu_armada-37xx}/board.c (100%) rename include/configs/{mvebu_db-88f3720.h => mvebu_armada-37xx.h} (96%) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 412bda4160..a256c2fb77 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -74,8 +74,8 @@ config TARGET_CLEARFOG bool "Support ClearFog" select 88F6820 -config TARGET_MVEBU_DB_88F3720 - bool "Support DB-88F3720 Armada 3720" +config TARGET_MVEBU_ARMADA_37XX + bool "Support Armada 37xx platforms" select ARMADA_3700 config TARGET_DB_88F6720 @@ -116,7 +116,7 @@ endchoice config SYS_BOARD default "clearfog" if TARGET_CLEARFOG - default "mvebu_db-88f3720" if TARGET_MVEBU_DB_88F3720 + default "mvebu_armada-37xx" if TARGET_MVEBU_ARMADA_37XX default "db-88f6720" if TARGET_DB_88F6720 default "db-88f6820-gp" if TARGET_DB_88F6820_GP default "db-88f6820-amc" if TARGET_DB_88F6820_AMC @@ -128,7 +128,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "clearfog" if TARGET_CLEARFOG - default "mvebu_db-88f3720" if TARGET_MVEBU_DB_88F3720 + default "mvebu_armada-37xx" if TARGET_MVEBU_ARMADA_37XX default "db-88f6720" if TARGET_DB_88F6720 default "db-88f6820-gp" if TARGET_DB_88F6820_GP default "db-88f6820-amc" if TARGET_DB_88F6820_AMC @@ -140,7 +140,7 @@ config SYS_CONFIG_NAME config SYS_VENDOR default "Marvell" if TARGET_DB_MV784MP_GP - default "Marvell" if TARGET_MVEBU_DB_88F3720 + default "Marvell" if TARGET_MVEBU_ARMADA_37XX default "Marvell" if TARGET_DB_88F6720 default "Marvell" if TARGET_DB_88F6820_GP default "Marvell" if TARGET_DB_88F6820_AMC diff --git a/board/Marvell/mvebu_db-88f3720/MAINTAINERS b/board/Marvell/mvebu_armada-37xx/MAINTAINERS similarity index 58% rename from board/Marvell/mvebu_db-88f3720/MAINTAINERS rename to board/Marvell/mvebu_armada-37xx/MAINTAINERS index 4e80917c72..52a3869b29 100644 --- a/board/Marvell/mvebu_db-88f3720/MAINTAINERS +++ b/board/Marvell/mvebu_armada-37xx/MAINTAINERS @@ -1,6 +1,6 @@ MVEBU_DB_88F3720 BOARD M: Stefan Roese S: Maintained -F: board/Marvell/mvebu_db-88f3720/ -F: include/configs/mvebu_db-88f3720.h +F: board/Marvell/mvebu_armada-37xx/ +F: include/configs/mvebu_armada-37xx.h F: configs/mvebu_db-88f3720_defconfig diff --git a/board/Marvell/mvebu_db-88f3720/Makefile b/board/Marvell/mvebu_armada-37xx/Makefile similarity index 100% rename from board/Marvell/mvebu_db-88f3720/Makefile rename to board/Marvell/mvebu_armada-37xx/Makefile diff --git a/board/Marvell/mvebu_db-88f3720/board.c b/board/Marvell/mvebu_armada-37xx/board.c similarity index 100% rename from board/Marvell/mvebu_db-88f3720/board.c rename to board/Marvell/mvebu_armada-37xx/board.c diff --git a/configs/mvebu_db-88f3720_defconfig b/configs/mvebu_db-88f3720_defconfig index 80f2599b3f..4286695612 100644 --- a/configs/mvebu_db-88f3720_defconfig +++ b/configs/mvebu_db-88f3720_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_MVEBU_DB_88F3720=y +CONFIG_TARGET_MVEBU_ARMADA_37XX=y CONFIG_DEFAULT_DEVICE_TREE="armada-3720-db" CONFIG_AHCI=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_armada-37xx.h similarity index 96% rename from include/configs/mvebu_db-88f3720.h rename to include/configs/mvebu_armada-37xx.h index 6bb78e09b1..7eefdb2fd5 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_armada-37xx.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _CONFIG_MVEBU_DB_88F3720_H -#define _CONFIG_MVEBU_DB_88F3720_H +#ifndef _CONFIG_MVEBU_ARMADA_37XX_H +#define _CONFIG_MVEBU_ARMADA_37XX_H /* * High Level Configuration Options (easy to change) @@ -126,4 +126,4 @@ #define CONFIG_SUPPORT_VFAT -#endif /* _CONFIG_MVEBU_DB_88F3720_H */ +#endif /* _CONFIG_MVEBU_ARMADA_37XX_H */