diff options
author | Tom Rini <trini@konsulko.com> | 2019-03-26 23:17:21 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-03-26 23:17:21 -0400 |
commit | 2b9b9cdd5f9ae1cbc786ba3c2255a51b3ea4a636 (patch) | |
tree | 6dbe4a091a06ae0f488498c63819c8ef7bd4e02f /arch/arm | |
parent | e7134b9714ed851095e8bcf8b66e65c6f870634e (diff) | |
parent | abe66b1b5decf9cc2fb5daad42c9e870e5b99b67 (diff) |
Merge branch '2019-03-25-master-imports'
- Convert various SPI related options to Kconfig
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-exynos/spl_boot.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/config.h | 15 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/include/mach/config.h | 15 |
3 files changed, 1 insertions, 31 deletions
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c index b4945bd8e2..103bb38d45 100644 --- 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/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index aea60688c2..893bd3f763 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -61,21 +61,6 @@ #endif /* - * SPI Flash configuration - */ -#ifdef CONFIG_CMD_SF -#ifndef CONFIG_ENV_SPI_BUS -# define CONFIG_ENV_SPI_BUS 0 -#endif -#ifndef CONFIG_ENV_SPI_CS -# define CONFIG_ENV_SPI_CS 0 -#endif -#ifndef CONFIG_ENV_SPI_MAX_HZ -# define CONFIG_ENV_SPI_MAX_HZ 50000000 -#endif -#endif - -/* * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index e3235fc67e..71c4f70efc 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -45,21 +45,6 @@ #define MV_UART_CONSOLE_BASE MVEBU_UART0_BASE -/* - * SPI Flash configuration - */ -#ifdef CONFIG_CMD_SF -#ifndef CONFIG_ENV_SPI_BUS -# define CONFIG_ENV_SPI_BUS 0 -#endif -#ifndef CONFIG_ENV_SPI_CS -# define CONFIG_ENV_SPI_CS 0 -#endif -#ifndef CONFIG_ENV_SPI_MAX_HZ -# define CONFIG_ENV_SPI_MAX_HZ 50000000 -#endif -#endif - /* Needed for SPI NOR booting in SPL */ #define CONFIG_DM_SEQ_ALIAS 1 |