arm: mvebu: Consolidate board Kconfig options into one file
Subsystems (5)
PATCH 1/3 arm: mvebu: Consolidate board Kconfig options into one file
Merging all the board specific Kconfig options into the main Kconfig file for mach-mvebu makes things easier to maintain.
--- arch/arm/Kconfig | 4 ---- arch/arm/mach-mvebu/Kconfig | 17 +++++++++++++++++ board/Marvell/db-88f6820-gp/Kconfig | 12 ------------ board/Marvell/db-mv784mp-gp/Kconfig | 12 ------------ board/maxbcm/Kconfig | 9 --------- board/solidrun/clearfog/Kconfig | 12 ------------ 6 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 board/Marvell/db-88f6820-gp/Kconfig delete mode 100644 board/Marvell/db-mv784mp-gp/Kconfig delete mode 100644 board/maxbcm/Kconfig delete mode 100644 board/solidrun/clearfog/Kconfig
arch/arm/Kconfig +0 -4
@@ -774,8 +774,6 @@ source "board/BuR/kwb/Kconfig" source "board/BuR/tseries/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" -source "board/Marvell/db-88f6820-gp/Kconfig" -source "board/Marvell/db-mv784mp-gp/Kconfig" source "board/Marvell/gplugd/Kconfig" source "board/armadeus/apf27/Kconfig" source "board/armltd/vexpress/Kconfig"
@@ -814,7 +812,6 @@ source "board/h2200/Kconfig" source "board/hisilicon/hikey/Kconfig" source "board/imx31_phycore/Kconfig" source "board/isee/igep0033/Kconfig" -source "board/maxbcm/Kconfig" source "board/mpl/vcma9/Kconfig" source "board/olimex/mx23_olinuxino/Kconfig" source "board/phytec/pcm051/Kconfig"
@@ -827,7 +824,6 @@ source "board/siemens/draco/Kconfig" source "board/siemens/pxm2/Kconfig" source "board/siemens/rut/Kconfig" source "board/silica/pengwyn/Kconfig" -source "board/solidrun/clearfog/Kconfig" source "board/spear/spear300/Kconfig" source "board/spear/spear310/Kconfig" source "board/spear/spear320/Kconfig"
arch/arm/mach-mvebu/Kconfig +17 -0
@@ -18,6 +18,23 @@ config TARGET_MAXBCM endchoice +config SYS_BOARD + default "clearfog" if TARGET_CLEARFOG + default "db-88f6820-gp" if TARGET_DB_88F6820_GP + default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP + default "maxbcm" if TARGET_MAXBCM + +config SYS_CONFIG_NAME + default "clearfog" if TARGET_CLEARFOG + default "db-88f6820-gp" if TARGET_DB_88F6820_GP + default "db-mv784mp-gp" if TARGET_DB_MV784MP_GP + default "maxbcm" if TARGET_MAXBCM + +config SYS_VENDOR + default "Marvell" if TARGET_DB_MV784MP_GP + default "Marvell" if TARGET_DB_88F6820_GP + default "solidrun" if TARGET_CLEARFOG + config SYS_SOC default "mvebu"
board/Marvell/db-88f6820-gp/Kconfig deleted +0 -12
@@ -1,12 +0,0 @@ -if TARGET_DB_88F6820_GP - -config SYS_BOARD - default "db-88f6820-gp" - -config SYS_VENDOR - default "Marvell" - -config SYS_CONFIG_NAME - default "db-88f6820-gp" - -endif
board/Marvell/db-mv784mp-gp/Kconfig deleted +0 -12
@@ -1,12 +0,0 @@ -if TARGET_DB_MV784MP_GP - -config SYS_BOARD - default "db-mv784mp-gp" - -config SYS_VENDOR - default "Marvell" - -config SYS_CONFIG_NAME - default "db-mv784mp-gp" - -endif
board/maxbcm/Kconfig deleted +0 -9
@@ -1,9 +0,0 @@ -if TARGET_MAXBCM - -config SYS_BOARD - default "maxbcm" - -config SYS_CONFIG_NAME - default "maxbcm" - -endif
board/solidrun/clearfog/Kconfig deleted +0 -12
@@ -1,12 +0,0 @@ -if TARGET_CLEARFOG - -config SYS_BOARD - default "clearfog" - -config SYS_VENDOR - default "solidrun" - -config SYS_CONFIG_NAME - default "clearfog" - -endif
Signature · 1 line
2.6.4
PATCH 2/3 arm: mvebu: Move SoC selection (A38X vs AXP) into Kconfig
Until now, the SoC selection for the ARCH_MVEBU platforms has been done in the config header. Using CONFIG_ARMADA_XP in a non-clear way. As it needed to get selected for AXP and A38x based boards. This patch now changes this to move the SoC selection to Kconfig. And also uses CONFIG_ARCH_MVEBU as a common define for both AXP and A38x. This makes things a bit clearer - especially for new board additions.
Additionally the defines CONFIG_SYS_MVEBU_DDR_AXP and CONFIG_SYS_MVEBU_DDR_A38X are replaced with the already available CONFIG_ARMADA_38X and CONFIG_ARMADA_XP.
And CONFIG_DDR3 is removed, as its not referenced anywhere.
--- arch/arm/Makefile | 2 +- arch/arm/mach-mvebu/Kconfig | 10 ++++++++++ arch/arm/mach-mvebu/Makefile | 8 ++++---- arch/arm/mach-mvebu/dram.c | 11 ++++------- arch/arm/mach-mvebu/include/mach/config.h | 6 +++++- arch/arm/mach-mvebu/mbus.c | 2 +- arch/arm/mach-mvebu/timer.c | 2 +- drivers/Makefile | 4 ++-- drivers/block/mvsata_ide.c | 6 +++--- drivers/i2c/mvtwsi.c | 2 +- include/configs/clearfog.h | 6 ------ include/configs/db-88f6820-gp.h | 6 ------ include/configs/db-mv784mp-gp.h | 2 -- include/configs/maxbcm.h | 2 -- tools/Makefile | 2 +- 15 files changed, 33 insertions(+), 38 deletions(-)
arch/arm/Makefile +1 -1
@@ -49,7 +49,7 @@ machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_KEYSTONE) += keystone # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood -machine-$(CONFIG_ARMADA_XP) += mvebu +machine-$(CONFIG_ARCH_MVEBU) += mvebu # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x
arch/arm/mach-mvebu/Kconfig +10 -0
@@ -1,20 +1,30 @@ if ARCH_MVEBU +config ARMADA_38X + bool + +config ARMADA_XP + bool + choice prompt "Marvell MVEBU (Armada XP/38x) board select" optional config TARGET_CLEARFOG bool "Support ClearFog" + select ARMADA_38X config TARGET_DB_88F6820_GP bool "Support DB-88F6820-GP" + select ARMADA_38X config TARGET_DB_MV784MP_GP bool "Support db-mv784mp-gp" + select ARMADA_XP config TARGET_MAXBCM bool "Support maxbcm" + select ARMADA_XP endchoice
arch/arm/mach-mvebu/Makefile +4 -4
@@ -15,8 +15,8 @@ else obj-y = cpu.o obj-y += dram.o ifndef CONFIG_SPL_BUILD -obj-$(CONFIG_SYS_MVEBU_DDR_A38X) += ../../../drivers/ddr/marvell/a38x/xor.o -obj-$(CONFIG_SYS_MVEBU_DDR_AXP) += ../../../drivers/ddr/marvell/axp/xor.o +obj-$(CONFIG_ARMADA_38X) += ../../../drivers/ddr/marvell/a38x/xor.o +obj-$(CONFIG_ARMADA_XP) += ../../../drivers/ddr/marvell/axp/xor.o endif obj-y += gpio.o obj-y += mbus.o
@@ -24,7 +24,7 @@ obj-y += timer.o obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_SPL_BUILD) += lowlevel_spl.o -obj-$(CONFIG_SYS_MVEBU_DDR_A38X) += serdes/a38x/ -obj-$(CONFIG_SYS_MVEBU_DDR_AXP) += serdes/axp/ +obj-$(CONFIG_ARMADA_38X) += serdes/a38x/ +obj-$(CONFIG_ARMADA_XP) += serdes/axp/ endif
arch/arm/mach-mvebu/dram.c +4 -7
@@ -12,11 +12,8 @@#include <asm/arch/cpu.h> #include <asm/arch/soc.h> -#ifdef CONFIG_SYS_MVEBU_DDR_A38X -#include "../../../drivers/ddr/marvell/axp/xor.h" -#include "../../../drivers/ddr/marvell/axp/xor_regs.h" -#endif -#ifdef CONFIG_SYS_MVEBU_DDR_AXP +#if defined(CONFIG_ARCH_MVEBU ) +/* Use common XOR definitions for A3x and AXP */ #include "../../../drivers/ddr/marvell/axp/xor.h" #include "../../../drivers/ddr/marvell/axp/xor_regs.h" #endif
@@ -112,7 +109,7 @@ void mvebu_sdram_size_adjust(enum memory_bank bank)mvebu_sdram_bs_set (bank, size); } -#if defined(CONFIG_SYS_MVEBU_DDR_A38X ) || defined(CONFIG_SYS_MVEBU_DDR_AXP ) +#if defined(CONFIG_ARCH_MVEBU )static u32 xor_ctrl_save;static u32 xor_base_save;static u32 xor_mask_save;
@@ -292,7 +289,7 @@ void dram_init_banksize(void) } } -#if defined(CONFIG_ARMADA_XP ) +#if defined(CONFIG_ARCH_MVEBU )void board_add_ram_info (int use_default) {struct sar_freq_modes sar_freq;
arch/arm/mach-mvebu/include/mach/config.h +5 -1
@@ -17,7 +17,11 @@#include <asm/arch/soc.h> -#if defined(CONFIG_ARMADA_XP ) +#if defined(CONFIG_ARMADA_XP ) || defined(CONFIG_ARMADA_38X ) +/* +* Set this for the common xor register definitions needed in dram.c +* for A38x as well here. +*/ #define MV88F78X60 /* for the DDR training bin_hdr code */ #endif
arch/arm/mach-mvebu/mbus.c +1 -1
@@ -491,7 +491,7 @@ int mvebu_mbus_probe(struct mbus_win windows[], int count)#if defined(CONFIG_KIRKWOOD ) mbus_state.soc = &kirkwood_mbus_data;#endif -#if defined(CONFIG_ARMADA_XP ) +#if defined(CONFIG_ARCH_MVEBU ) mbus_state.soc = &armada_370_xp_mbus_data;#endif
arch/arm/mach-mvebu/timer.c +1 -1
@@ -31,7 +31,7 @@ int timer_init(void)writel (TIMER_LOAD_VAL ,MVEBU_TIMER_BASE +0x10 );writel (TIMER_LOAD_VAL ,MVEBU_TIMER_BASE +0x14 ); -#if defined(CONFIG_ARMADA_XP ) +#if defined(CONFIG_ARCH_MVEBU )/* On Armada XP / 38x ..., the 25MHz clock source needs to be enabled */ setbits_le32 (MVEBU_TIMER_BASE +0x00 ,BIT (11 ));#endif
drivers/Makefile +2 -2
@@ -14,8 +14,8 @@ obj-$(CONFIG_SPL_I2C_SUPPORT) += i2c/ obj-$(CONFIG_SPL_GPIO_SUPPORT) += gpio/ obj-$(CONFIG_SPL_MMC_SUPPORT) += mmc/ obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/ -obj-$(CONFIG_SYS_MVEBU_DDR_A38X) += ddr/marvell/a38x/ -obj-$(CONFIG_SYS_MVEBU_DDR_AXP) += ddr/marvell/axp/ +obj-$(CONFIG_ARMADA_38X) += ddr/marvell/a38x/ +obj-$(CONFIG_ARMADA_XP) += ddr/marvell/axp/ obj-$(CONFIG_ALTERA_SDRAM) += ddr/altera/ obj-$(CONFIG_SPL_SERIAL_SUPPORT) += serial/ obj-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += mtd/spi/
drivers/block/mvsata_ide.c +3 -3
@@ -13,7 +13,7 @@#include <asm/arch/orion5x.h> #elif defined(CONFIG_KIRKWOOD )#include <asm/arch/soc.h> -#elif defined(CONFIG_ARMADA_XP ) +#elif defined(CONFIG_ARCH_MVEBU )#include <linux/mbus.h> #endif
@@ -102,7 +102,7 @@ struct mvsata_port_registers {* Initialize SATA memory windows for Armada XP */ -#ifdef CONFIG_ARMADA_XP +#ifdef CONFIG_ARCH_MVEBU static void mvsata_ide_conf_mbus_windows (void ) {const struct mbus_dram_target_info *dram;
@@ -174,7 +174,7 @@ int ide_preinit(void)int ret =MVSATA_STATUS_TIMEOUT ;int status; -#ifdef CONFIG_ARMADA_XP +#ifdef CONFIG_ARCH_MVEBU mvsata_ide_conf_mbus_windows ();#endif
drivers/i2c/mvtwsi.c +1 -1
@@ -20,7 +20,7 @@#if defined(CONFIG_ORION5X )#include <asm/arch/orion5x.h> -#elif (defined(CONFIG_KIRKWOOD ) || defined(CONFIG_ARMADA_XP )) +#elif (defined(CONFIG_KIRKWOOD ) || defined(CONFIG_ARCH_MVEBU ))#include <asm/arch/soc.h> #elif defined(CONFIG_SUNXI )#include <asm/arch/i2c.h>
include/configs/clearfog.h +0 -6
@@ -10,8 +10,6 @@/* * High Level Configuration Options (easy to change) */ -#define CONFIG_ARMADA_XP /* SOC Family Name */ -#define CONFIG_ARMADA_38X #define CONFIG_DB_88F6820_GP /* Board target name for DDR training */ #define CONFIG_DISPLAY_BOARDINFO_LATE
@@ -170,10 +168,6 @@#endif #endif -/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ -#define CONFIG_SYS_MVEBU_DDR_A38X -#define CONFIG_DDR3 -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros
include/configs/db-88f6820-gp.h +0 -6
@@ -10,8 +10,6 @@/* * High Level Configuration Options (easy to change) */ -#define CONFIG_ARMADA_XP /* SOC Family Name */ -#define CONFIG_ARMADA_38X #define CONFIG_DB_88F6820_GP /* Board target name for DDR training */ #define CONFIG_DISPLAY_BOARDINFO_LATE
@@ -170,10 +168,6 @@#endif #endif -/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ -#define CONFIG_SYS_MVEBU_DDR_A38X -#define CONFIG_DDR3 -/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros
include/configs/db-mv784mp-gp.h +0 -2
@@ -10,7 +10,6 @@/* * High Level Configuration Options (easy to change) */ -#define CONFIG_ARMADA_XP /* SOC Family Name */ #define CONFIG_DB_784MP_GP /* Board target name for DDR training */ #define CONFIG_DISPLAY_BOARDINFO_LATE
@@ -144,7 +143,6 @@#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ -#define CONFIG_SYS_MVEBU_DDR_AXP #define CONFIG_SPD_EEPROM 0x4e#define CONFIG_BOARD_ECC_SUPPORT /* this board supports ECC */
include/configs/maxbcm.h +0 -2
@@ -10,7 +10,6 @@/* * High Level Configuration Options (easy to change) */ -#define CONFIG_ARMADA_XP /* SOC Family Name */ #define CONFIG_DISPLAY_BOARDINFO_LATE /*
@@ -106,7 +105,6 @@#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ -#define CONFIG_SYS_MVEBU_DDR_AXP #define CONFIG_DDR_FIXED_SIZE (1 << 20)/* 1GiB */ #define CONFIG_BOARD_ECC_SUPPORT /* this board supports ECC */
tools/Makefile +1 -1
@@ -156,7 +156,7 @@ ubsha1-objs := os_support.o ubsha1.o lib/sha1.o HOSTCFLAGS_ubsha1.o := -pedantic hostprogs-$(CONFIG_KIRKWOOD) += kwboot -hostprogs-$(CONFIG_ARMADA_XP) += kwboot +hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot hostprogs-y += proftool hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela
Signature · 1 line
2.6.4
PATCH 3/3 arm: mvebu: Remove leftover Makefile
In reply to Stefan RoeseThis Makefile was not used since quite some time. I only missed to remove it in the move to mach-mvebu. So lets remove it now so that the mvebu-common directory is really removed completely.
--- arch/arm/mvebu-common/Makefile | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 arch/arm/mvebu-common/Makefile
arch/arm/mvebu-common/Makefile deleted +0 -14
@@ -1,14 +0,0 @@ -# -# (C) Copyright 2009 -# Marvell Semiconductor <www.marvell.com> -# Written-by: Prafulla Wadaskar <[email protected]> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y = dram.o -obj-y += gpio.o -obj-$(CONFIG_ARMADA_XP) += mbus.o -obj-y += timer.o - -obj-y += serdes/
Signature · 1 line
2.6.4