mvebu: Migrate CONFIG_DDR_32BIT/64BIT to Kconfig

Move CONFIG_DDR_32BIT/64BIT to Kconfig as a choice for Armada XP
platforms.  Make 64bit the default as this mirrors the current code.

Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 89737a37ad9e2db419ca27a8ac940233b5c0219a..1daa64763b03e9cbd13c4b8986609a0e7273afee 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -184,6 +184,19 @@ config TARGET_CRS3XX_98DX3236
 
 endchoice
 
+choice
+       prompt "DDR bus width"
+       default DDR_64BIT
+       depends on ARMADA_XP
+
+config DDR_64BIT
+       bool "64bit bus width"
+
+config DDR_32BIT
+       bool "32bit bus width"
+
+endchoice
+
 config SYS_BOARD
        default "clearfog" if TARGET_CLEARFOG
        default "helios4" if TARGET_HELIOS4

diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index 90dd10ca0b028eb8606d5093f309834dffd6ca55..f10f149b2fc793fb6a553878f27d25fc01060a56 100644 (file)
--- a/configs/ds414_defconfig
+++ b/configs/ds414_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_DS414=y
+CONFIG_DDR_32BIT=y
 CONFIG_ENV_SIZE=0x10000
 CONFIG_ENV_OFFSET=0x7E0000
 CONFIG_ENV_SECT_SIZE=0x10000

diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 8b8dc2245ba3e17310470aab2ec8b67344cfaffb..8a78ab3e15507433f3953657b22dc70049fc2f10 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -63,9 +63,6 @@
 #define CONFIG_SPL_STACK               (0x40000000 + ((192 - 16) << 10))
 #define CONFIG_SPL_BOOTROM_SAVE                (CONFIG_SPL_STACK + 4)
 
-/* DS414 bus width is 32bits */
-#define CONFIG_DDR_32BIT
-
 /* Default Environment */
 #define CONFIG_LOADADDR                0x80000
 #define CONFIG_BOOTCOMMAND                                     \