Convert CONFIG_SPL_BSS_MAX_SIZE et al to Kconfig

[platform/kernel/u-boot.git] / include / configs / turris_omnia.h

diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 8646633..fbdd2a4 100644 (file)
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -17,9 +17,6 @@
  * U-Boot into it.
  */
 
-/* USB/EHCI configuration */
-#define CONFIG_EHCI_IS_TDI
-
 /* Environment in SPI NOR flash */
 
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
@@ -31,18 +28,11 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL_SIZE                        (140 << 10)
-#define CONFIG_SPL_MAX_SIZE            (CONFIG_SPL_SIZE - 0x0030)
 
 #define CONFIG_SPL_BSS_START_ADDR      (0x40000000 + CONFIG_SPL_SIZE)
-#define CONFIG_SPL_BSS_MAX_SIZE                (16 << 10)
-
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_MALLOC_SIMPLE
-#endif
 
 #define CONFIG_SPL_STACK               (0x40000000 + ((192 - 16) << 10))
 #define CONFIG_SPL_BOOTROM_SAVE                (CONFIG_SPL_STACK + 4)
-#define CONFIG_SPL_DRIVERS_MISC
 
 #ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC
 /* SPL related MMC defines */
@@ -60,28 +50,11 @@
 /* Include the common distro boot environment */
 #ifndef CONFIG_SPL_BUILD
 
-#ifdef CONFIG_MMC
-#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)
-#else
-#define BOOT_TARGET_DEVICES_MMC(func)
-#endif
-
-#ifdef CONFIG_USB_STORAGE
-#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0)
-#else
-#define BOOT_TARGET_DEVICES_USB(func)
-#endif
-
-#ifdef CONFIG_SCSI
-#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
-#else
-#define BOOT_TARGET_DEVICES_SCSI(func)
-#endif
-
 #define BOOT_TARGET_DEVICES(func) \
-       BOOT_TARGET_DEVICES_MMC(func) \
-       BOOT_TARGET_DEVICES_SCSI(func) \
-       BOOT_TARGET_DEVICES_USB(func) \
+       func(MMC, mmc, 0) \
+       func(NVME, nvme, 0) \
+       func(SCSI, scsi, 0) \
+       func(USB, usb, 0) \
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
 
@@ -127,7 +100,6 @@
        LOAD_ADDRESS_ENV_SETTINGS \
        "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
        "console=ttyS0,115200\0" \
-       "ethact=ethernet@34000\0" \
        "bootcmd_rescue=" TURRIS_OMNIA_BOOTCMD_RESCUE "\0" \
        BOOTENV