Convert CONFIG_SPD_EEPROM to Kconfig

This converts the following to Kconfig:
   CONFIG_SPD_EEPROM

Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index dd43a0c08d4acd1d1526c965d2d4080fac88fb34..0acc0b41091758946fee39e4ba9ad09323cd4436 100644 (file)
--- a/README
+++ b/README
@@ -1683,13 +1683,6 @@ Low Level (hardware related) configuration options:
                Sets the EBC0_CFG register for the NDFC. If not defined
                a default value will be used.
 
-- CONFIG_SPD_EEPROM
-               Get DDR timing information from an I2C EEPROM. Common
-               with pluggable memory modules such as SODIMMs
-
-  SPD_EEPROM_ADDRESS
-               I2C address of the SPD EEPROM
-
 - CONFIG_SYS_SPD_BUS_NUM
                If SPD EEPROM is on an I2C bus other than the first
                one, specify here. Note that the value must resolve

diff --git a/configs/MPC8548CDS_36BIT_defconfig b/configs/MPC8548CDS_36BIT_defconfig
index 86a67d7b21fb0fc9a73cb5a545d62d4ff2b264b2..517fd785dd394c1b01bfcd69202a4037a70c36af 100644 (file)
--- a/configs/MPC8548CDS_36BIT_defconfig
+++ b/configs/MPC8548CDS_36BIT_defconfig
@@ -45,6 +45,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y

diff --git a/configs/MPC8548CDS_defconfig b/configs/MPC8548CDS_defconfig
index 2ac4f266850ef68e4f5620190a582b9b3e3e3b3d..5c83e808d572263330994f7c78234df11ac0a58b 100644 (file)
--- a/configs/MPC8548CDS_defconfig
+++ b/configs/MPC8548CDS_defconfig
@@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y

diff --git a/configs/MPC8548CDS_legacy_defconfig b/configs/MPC8548CDS_legacy_defconfig
index faabd7bc045ad326c12289f92738c37981e1de30..b354237db3eba7bef1f8145da02b3eca21135777 100644 (file)
--- a/configs/MPC8548CDS_legacy_defconfig
+++ b/configs/MPC8548CDS_legacy_defconfig
@@ -44,6 +44,7 @@ CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="8548cds/uImage.uboot"
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="eTSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_DDR_ECC=y
 CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y

diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index ab52ea26a08983b3917626b1b6fd521b4f7a67f2..f45f570764cd3d129be49a078b72f1ef044057f5 100644 (file)
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -57,6 +57,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_ADDR_REDUND=0xFFF20000
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="TSEC0"
+CONFIG_SPD_EEPROM=y
 CONFIG_CHIP_SELECTS_PER_CTRL=2
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xFE001001

diff --git a/drivers/ddr/Kconfig b/drivers/ddr/Kconfig
index 738b7884012f3fbfdd6d24b96f7e69da4ef5937f..fa873cc48750548b3b5587f8c25005f7ae3ba9e3 100644 (file)
--- a/drivers/ddr/Kconfig
+++ b/drivers/ddr/Kconfig
@@ -37,3 +37,11 @@ config SYS_SPD_BUS_NUM
 
 source "drivers/ddr/altera/Kconfig"
 source "drivers/ddr/imx/Kconfig"
+
+config SPD_EEPROM
+       bool "DDR controller makes use of an SPD EEPROM for JEDEC information"
+       depends on SYS_FSL_DDR || SYS_FSL_MMDC || CONFIG_ARMADA_XP
+       help
+         Get DDR timing information from an I2C EEPROM. Common with pluggable
+         memory modules such as SODIMMs. You must define SPD_EEPROM_ADDRESS
+         to the I2C address of the SPD EEPROM.

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 83eb18c3b7ace95c09cd23503c6d4d2c8a7c5340..780ee5ae865a0d1f523147b28a9b4776dea73709 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -30,7 +30,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW       CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for DDR setup*/
 
 #define CONFIG_MEM_INIT_VALUE  0xDeadBeef
 

diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 7b305955c9629b15d9dd265d3cc80fe828661ca0..bf8b35102ad79a9fe7eb6e07b9b5d10d52fd1575 100644 (file)
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -45,7 +45,4 @@
 /* SPL */
 /* Defines for SPL */
 
-/* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */
-#define CONFIG_SPD_EEPROM              0x4e
-
 #endif /* _CONFIG_DB_MV7846MP_GP_H */

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 0a2d5815170b39edbb62e67a5673845e0382134d..95393d3ab25e880bd6c9fb0f2c3100bb17182224 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -50,7 +50,6 @@
 #define CFG_SYS_CCSRBAR_PHYS_LOW       CFG_SYS_CCSRBAR
 
 /* DDR Setup */
-#define CONFIG_SPD_EEPROM              /* Use SPD EEPROM for DDR setup */
 
 #define CONFIG_MEM_INIT_VALUE  0xDeadBeef