summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLey Foon Tan <ley.foon.tan@intel.com>2017-04-05 17:32:51 +0800
committerMarek Vasut <marex@denx.de>2017-04-14 14:06:57 +0200
commit707cd012e2e1dbed7150f7908727abb7bdc4c1a7 (patch)
tree9278f440d699bfb81fca30223545c940feaa29af
parente11b5e8d6ef72f2e83e680d132a0617a4540f0aa (diff)
arm: socfpga: Convert Altera DDR SDRAM driver to use Kconfig
Convert Altera DDR SDRAM driver to use Kconfig method. Enable ALTERA_SDRAM by default if it is on Gen5 target. Arria 10 will have different driver. Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
-rw-r--r--arch/arm/mach-socfpga/Kconfig1
-rw-r--r--drivers/Kconfig2
-rw-r--r--drivers/ddr/Kconfig1
-rw-r--r--drivers/ddr/altera/Kconfig5
-rw-r--r--drivers/ddr/altera/Makefile4
-rw-r--r--include/configs/socfpga_common.h5
6 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 18bb6dce3c..9bfee04098 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -43,6 +43,7 @@ config TARGET_SOCFPGA_CYCLONE5
config TARGET_SOCFPGA_GEN5
bool
+ select ALTERA_SDRAM
choice
prompt "Altera SOCFPGA board select"
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 0e5d97d166..3e6bbacd15 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -14,6 +14,8 @@ source "drivers/cpu/Kconfig"
source "drivers/crypto/Kconfig"
+source "drivers/ddr/Kconfig"
+
source "drivers/demo/Kconfig"
source "drivers/ddr/fsl/Kconfig"
diff --git a/drivers/ddr/Kconfig b/drivers/ddr/Kconfig
new file mode 100644
index 0000000000..b764add060
--- /dev/null
+++ b/drivers/ddr/Kconfig
@@ -0,0 +1 @@
+source "drivers/ddr/altera/Kconfig"
diff --git a/drivers/ddr/altera/Kconfig b/drivers/ddr/altera/Kconfig
new file mode 100644
index 0000000000..021ec1d857
--- /dev/null
+++ b/drivers/ddr/altera/Kconfig
@@ -0,0 +1,5 @@
+config ALTERA_SDRAM
+ bool "SoCFPGA DDR SDRAM driver"
+ depends on TARGET_SOCFPGA_GEN5
+ help
+ Enable DDR SDRAM controller for the SoCFPGA devices.
diff --git a/drivers/ddr/altera/Makefile b/drivers/ddr/altera/Makefile
index 1ca705856d..bdd28722a9 100644
--- a/drivers/ddr/altera/Makefile
+++ b/drivers/ddr/altera/Makefile
@@ -8,4 +8,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_ALTERA_SDRAM) += sdram.o sequencer.o
+ifdef CONFIG_ALTERA_SDRAM
+obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += sdram.o sequencer.o
+endif
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 8057b88475..d4d72fa91d 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -72,11 +72,6 @@
#define CONFIG_SYS_PL310_BASE SOCFPGA_MPUL2_ADDRESS
/*
- * SDRAM controller
- */
-#define CONFIG_ALTERA_SDRAM
-
-/*
* EPCS/EPCQx1 Serial Flash Controller
*/
#ifdef CONFIG_ALTERA_SPI