Message ID | 1566481318-16029-5-git-send-email-hannes.schmelzer@br-automation.com |
---|---|
State | Accepted |
Commit | f8584bbe729ff75d19196b7ebbc97fe4f7850016 |
Delegated to: | Tom Rini |
Headers | show |
Series | convert CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig | expand |
On Thu, 2019-08-22 at 15:41 +0200, Hannes Schmelzer wrote: > the x530 board needs conversion of SPL_SPI_LOAD to Kconfig first > > Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > > configs/x530_defconfig | 1 + > include/configs/x530.h | 1 - > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/x530_defconfig b/configs/x530_defconfig > index 7db8de4..2bf20f4 100644 > --- a/configs/x530_defconfig > +++ b/configs/x530_defconfig > @@ -21,6 +21,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 80ae15b..0946121 100644 > --- a/include/configs/x530.h > +++ b/include/configs/x530.h > @@ -120,7 +120,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_O > FFS >
On Thu, Aug 22, 2019 at 03:41:45PM +0200, Hannes Schmelzer wrote: > the x530 board needs conversion of SPL_SPI_LOAD to Kconfig first > > Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> > Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Applied to u-boot/master, thanks!
diff --git a/configs/x530_defconfig b/configs/x530_defconfig index 7db8de4..2bf20f4 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -21,6 +21,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 80ae15b..0946121 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -120,7 +120,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
the x530 board needs conversion of SPL_SPI_LOAD to Kconfig first Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> --- configs/x530_defconfig | 1 + include/configs/x530.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)