exynos: replace CONFIG_ENV_SPI_BASE by CONFIG_SYS_SPI_BASE

Replace CONFIG_ENV_SPI_BASE by the better CONFIG_SYS_SPI_BASE (it is not the location for environment but the location for U-Boot) and, as it is the only platform with use this define, remove it from whitelist. Signed-off-by: Patrick Delaunay <[email protected]>
MrVan · Mar 25, 2019 · ac31d0d · ac31d0d
1 parent e608beb
commit ac31d0d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
@@ -107,7 +107,7 @@ static void exynos_spi_copy(unsigned int uboot_size, unsigned int uboot_addr)
 {
 	int upto, todo;
 	int i, timeout = 100;
-	struct exynos_spi *regs = (struct exynos_spi *)CONFIG_ENV_SPI_BASE;
+	struct exynos_spi *regs = (struct exynos_spi *)CONFIG_SYS_SPI_BASE;
 
 	set_spi_clk(PERIPH_ID_SPI1, 50000000); /* set spi clock to 50Mhz */
 	/* set the spi1 GPIO */

diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
@@ -17,7 +17,7 @@
 
 #define CONFIG_EXYNOS5_DT
 
-#define CONFIG_ENV_SPI_BASE	0x12D30000
+#define CONFIG_SYS_SPI_BASE	0x12D30000
 #define FLASH_SIZE		(4 << 20)
 #define CONFIG_ENV_OFFSET	(FLASH_SIZE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_SPI_BOOTING

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
@@ -498,7 +498,6 @@ CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SIZE_FLEX
 CONFIG_ENV_SIZE_REDUND
-CONFIG_ENV_SPI_BASE
 CONFIG_ENV_SPI_BUS
 CONFIG_ENV_SPI_CS
 CONFIG_ENV_SPI_MAX_HZ