Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-exynos/spl_boot.c | 6 +++--- include/configs/exynos5-dt-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c index 553dac75b61d..83bdee9f8579 100644 --- a/arch/arm/mach-exynos/spl_boot.c +++ b/arch/arm/mach-exynos/spl_boot.c @@ -94,7 +94,7 @@ static int config_branch_prediction(int set_cr_z) } #endif
-#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING static void spi_rx_tx(struct exynos_spi *regs, int todo, void *dinp, void const *doutp, int i) { @@ -220,7 +220,7 @@ void copy_uboot_to_ram(void)
u32 (*copy_bl2)(u32 offset, u32 nblock, u32 dst) = NULL; u32 offset = 0, size = 0; -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING struct spl_machine_param *param = spl_get_machine_params(); #endif #ifdef CONFIG_SUPPORT_EMMC_BOOT @@ -248,7 +248,7 @@ void copy_uboot_to_ram(void) bootmode = get_boot_mode();
switch (bootmode) { -#ifdef CONFIG_SPI_BOOTING +#ifdef CFG_SPI_BOOTING case BOOT_MODE_SERIAL: /* Customised function to copy u-boot from SF */ exynos_spi_copy(param->uboot_size, CONFIG_TEXT_BASE); diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h index c9e0c13172cc..a0cdbd746a9a 100644 --- a/include/configs/exynos5-dt-common.h +++ b/include/configs/exynos5-dt-common.h @@ -17,6 +17,6 @@
#define CFG_SYS_SPI_BASE 0x12D30000 #define FLASH_SIZE (4 << 20) -#define CONFIG_SPI_BOOTING +#define CFG_SPI_BOOTING
#endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9989d7052f14..cb15aa3c8f4e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -200,7 +200,7 @@ CFG_SMDK5420 CFG_SMP_PEN_ADDR CFG_SOCRATES CFG_SPI_ADDR -CONFIG_SPI_BOOTING +CFG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX