Convert CONFIG_ENV_SPI_BUS et al to Kconfig

This converts the following to Kconfig:
   CONFIG_ENV_SPI_BUS
   CONFIG_ENV_SPI_CS
   CONFIG_ENV_SPI_MAX_HZ
   CONFIG_ENV_SPI_MODE

As part of this, we use Kconfig to provide the defaults now that were
done in include/spi_flash.h.  We also in some cases change from using
CONFIG_ENV_SPI_FOO to CONFIG_SF_DEFAULT_FOO as those were the values in
use anyhow as ENV was not enabled.

Signed-off-by: Tom Rini <trini@konsulko.com>

4 files changed, 27 insertions, 11 deletions

diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 7d51be1f723..f8256126405 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -387,8 +387,8 @@ int fm_init_common(int index, struct ccsr_fman *reg)
 		struct udevice *new;
 
 		/* speed and mode will be read from DT */
-		ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS,
-					     CONFIG_ENV_SPI_CS, 0, 0, &new);
+		ret = spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS,
+					     CONFIG_SF_DEFAULT_CS, 0, 0, &new);
 
 		ucode_flash = dev_get_uclass_priv(new);
 #else
@@ -474,7 +474,7 @@ int fm_init_common(int index, struct ccsr_fman *reg)
 	struct udevice *new;
 
 	/* speed and mode will be read from DT */
-	ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
+	ret = spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS,
 				     0, 0, &new);
 
 	ucode_flash = dev_get_uclass_priv(new);
diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
index a13b331a508..b2724ee3e84 100644
--- a/drivers/net/pfe_eth/Kconfig
+++ b/drivers/net/pfe_eth/Kconfig
@@ -9,4 +9,20 @@ config SYS_FSL_PFE_ADDR
 	hex "PFE base address"
 	default 0x04000000
 
+config SYS_FSL_PFE_SPI_BUS
+	int "Value of SPI flash bus for PFE firmware"
+	default SF_DEFAULT_BUS
+
+config SYS_FSL_PFE_SPI_CS
+	int "Value of SPI flash chip select for PFE firmware"
+	default SF_DEFAULT_CS
+
+config SYS_FSL_PFE_SPI_MAX_HZ
+	int "Value of SPI flash max frequency for PFE firmware"
+	default SF_DEFAULT_SPEED
+
+config SYS_FSL_PFE_SPI_MODE
+	hex "Value of SPI flash work mode for PFE firmware"
+	default SF_DEFAULT_MODE
+
 endif
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index ad5bc3c8624..93e5ea55c78 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -179,10 +179,10 @@ int pfe_spi_flash_init(void)
 	if (!addr)
 		return -ENOMEM;
 
-	ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS,
-				     CONFIG_ENV_SPI_CS,
-				     CONFIG_ENV_SPI_MAX_HZ,
-				     CONFIG_ENV_SPI_MODE,
+	ret = spi_flash_probe_bus_cs(CONFIG_SYS_FSL_PFE_SPI_BUS,
+				     CONFIG_SYS_FSL_PFE_SPI_CS,
+				     CONFIG_SYS_FSL_PFE_SPI_MAX_HZ,
+				     CONFIG_SYS_FSL_PFE_SPI_MODE,
 				     &new);
 	if (ret) {
 		printf("SF: failed to probe spi\n");
diff --git a/drivers/net/phy/cortina.c b/drivers/net/phy/cortina.c
index 2ac02952450..778d93e609c 100644
--- a/drivers/net/phy/cortina.c
+++ b/drivers/net/phy/cortina.c
@@ -159,8 +159,8 @@ void cs4340_upload_firmware(struct phy_device *phydev)
 		struct spi_flash *ucode_flash;
 
 		addr = malloc(CONFIG_CORTINA_FW_LENGTH);
-		ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
-									 CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
+		ucode_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS,
+									 CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
 		if (!ucode_flash) {
 			puts("SF: probe for Cortina ucode failed\n");
 		} else {
@@ -212,8 +212,8 @@ void cs4340_upload_firmware(struct phy_device *phydev)
 	struct spi_flash *ucode_flash;
 
 	addr = malloc(CONFIG_CORTINA_FW_LENGTH);
-	ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
-				CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
+	ucode_flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS,
+				CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE);
 	if (!ucode_flash) {
 		puts("SF: probe for Cortina ucode failed\n");
 	} else {