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>

diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 18bb6dce3c86c18d6dfcb68c70968b13f184bb09..9bfee04098cc307952e872afdac6c3350ce0bd22 100644 (file)
--- 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 0e5d97d166464f3cb77dfff635353dc9d74d1ddc..3e6bbacd15c0064ae7cc67903e522227543c89c4 100644 (file)
--- 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 (file)
index 0000000..b764add
--- /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 (file)
index 0000000..021ec1d
--- /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 1ca705856d2b354a31243c7fe5ac2f82426ff706..bdd28722a98a638b078f73e678c8309f2fb82604 100644 (file)
--- 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 8057b8847562c5e20483adbe4ca069714755b9e9..d4d72fa91d583ba3a4c95940d48591fba4d15535 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -71,11 +71,6 @@
 #define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE          SOCFPGA_MPUL2_ADDRESS
 
-/*
- * SDRAM controller
- */
-#define CONFIG_ALTERA_SDRAM
-
 /*
  * EPCS/EPCQx1 Serial Flash Controller
  */