From: Hannes Schmelzer Date: Thu, 22 Aug 2019 13:41:45 +0000 (+0200) Subject: moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 4 X-Git-Tag: v2019.10-rc3~3^2~1 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f8584bbe729ff75d19196b7ebbc97fe4f7850016;p=oweals%2Fu-boot.git moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 4 the x530 board needs conversion of SPL_SPI_LOAD to Kconfig first Signed-off-by: Hannes Schmelzer Reviewed-by: Chris Packham --- diff --git a/configs/x530_defconfig b/configs/x530_defconfig index 66504b2963..a45ff62024 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -22,6 +22,7 @@ CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC=y CONFIG_MISC_INIT_R=y CONFIG_SPL_TEXT_BASE=0x40000030 CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_MEMINFO=y # CONFIG_CMD_FLASH is not set diff --git a/include/configs/x530.h b/include/configs/x530.h index 432611ca7c..16480d5693 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -117,7 +117,6 @@ #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) /* SPL related SPI defines */ -#define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS