summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvebu/mbus.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-12-21 13:56:33 +0100
committerStefan Roese <sr@denx.de>2016-01-14 14:08:59 +0100
commit81e33f4b65171a7dcb99a3efd9b3a45da129a21a (patch)
tree54ea0fb992bb43c740667556e7dbf5cd1d40373d /arch/arm/mach-mvebu/mbus.c
parentb322c83aa47f2fcf1af73a4f686ce4478fca19e3 (diff)
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. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Luka Perkov <luka.perkov@sartura.hr>
Diffstat (limited to 'arch/arm/mach-mvebu/mbus.c')
-rw-r--r--arch/arm/mach-mvebu/mbus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/mbus.c b/arch/arm/mach-mvebu/mbus.c
index 346278e1be..df263bc3b3 100644
--- a/arch/arm/mach-mvebu/mbus.c
+++ b/arch/arm/mach-mvebu/mbus.c
@@ -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