88F6820 is a specific Armada-38x chip that is used on the DB-88F6820-GP board. Rather than having DB_88F6820_GP and TARGET_DB_88F6820_GP which selects the former. Rename DB_88F6820_GP to 88F6820 so that other boards using the 88F6820 can be added.
Signed-off-by: Chris Packham judge.packham@gmail.com ---
arch/arm/mach-mvebu/Kconfig | 4 ++-- arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 220886aa592a..06820a5e4f2c 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -21,7 +21,7 @@ config MV78460 bool select ARMADA_XP
-config DB_88F6820_GP +config 88F6820 bool select ARMADA_38X
@@ -39,7 +39,7 @@ config TARGET_DB_88F6720
config TARGET_DB_88F6820_GP bool "Support DB-88F6820-GP" - select DB_88F6820_GP + select 88F6820
config TARGET_DB_MV784MP_GP bool "Support db-mv784mp-gp" diff --git a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c index 49d704a36230..cc3e5e23c0dd 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c +++ b/arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c @@ -45,7 +45,7 @@ u32 g_dev_id = -1;
u32 mv_board_id_get(void) { -#if defined(CONFIG_DB_88F6820_GP) +#if defined(CONFIG_TARGET_DB_88F6820_GP) return DB_GP_68XX_ID; #else /*