Disabling preloader generation on socfpga have issue with the Kconfig rules. Disabling it in the menuconfig gave error on console, and building with CONFIG_SPL=n resulted in compile error.

Signed-off-by: Eric Hoffman ehoffman@videotron.ca ---

arch/arm/Kconfig | 4 ++-- include/configs/socfpga_common.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f6d57f5505..0ffdf2ef7f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -707,14 +707,14 @@ config ARCH_SOCFPGA select CPU_V7 select SUPPORT_SPL select OF_CONTROL - select SPL_OF_CONTROL + select SPL_OF_CONTROL if SPL select DM select DM_SPI_FLASH select DM_SPI select ENABLE_ARM_SOC_BOOT0_HOOK select ARCH_EARLY_INIT_R select ARCH_MISC_INIT - select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION + select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION if SPL select SYS_THUMB_BUILD imply CMD_MTDPARTS imply CRC32_VERIFY diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 66e7c4fc8b..b2fa30a59f 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -20,7 +20,9 @@ #define CONFIG_TIMESTAMP /* Print image info with timestamp */

/* add target to build it automatically upon "make" */ +#if defined(CONFIG_SPL) #define CONFIG_BUILD_TARGET "u-boot-with-spl.sfp" +#endif

/* * Memory configurations