spl: spi: Move CONFIG_SPL_SPI_LOAD to Kconfig

[u-boot] / include / configs / turris_omnia.h

diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 3dbd2cacbae71dbcc1ad1b9d1f9b322274519184..1df806b60a99bfc82e2a7faea39df1eb0e9491dc 100644 (file)
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -13,14 +13,12 @@
  */
 
 #define CONFIG_MISC_INIT_R
-#define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /*
  * TEXT_BASE needs to be below 16MiB, since this area is scrubbed
  * for DDR ECC byte filling in the SPL before loading the main
  * U-Boot into it.
  */
-#define        CONFIG_SYS_TEXT_BASE    0x00800000
 #define CONFIG_SYS_TCLK                250000000       /* 250MHz */
 
 /*
@@ -59,9 +57,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                         CONFIG_SYS_SCSI_MAX_LUN)
 
-/* Additional FS support/configuration */
-#define CONFIG_SUPPORT_VFAT
-
 /* USB/EHCI configuration */
 #define CONFIG_EHCI_IS_TDI
 
@@ -79,15 +74,12 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif
 
-#define CONFIG_SYS_ALT_MEMTEST
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define RELOCATION_LIMITS_ENV_SETTINGS \
        "fdt_high=0x10000000\0"         \
        "initrd_high=0x10000000\0"
 
 /* Defines for SPL */
-#define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_SIZE                        (140 << 10)
 #define CONFIG_SPL_TEXT_BASE           0x40000030
 #define CONFIG_SPL_MAX_SIZE            (CONFIG_SPL_SIZE - 0x0030)
@@ -105,7 +97,6 @@
 
 #ifdef CONFIG_TURRIS_OMNIA_SPL_BOOT_DEVICE_SPI
 /* 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
 #endif
@@ -127,7 +118,6 @@
 
 /* Include the common distro boot environment */
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
 #ifdef CONFIG_MMC
 #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)