Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / ds414.h

diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index 192c055c5cc45c1801ada6973650e4f21c6358d5..552c7449d59cc343f19c4d76e4c60220214e37a1 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -78,7 +78,6 @@
 
 /* SPL */
 /* Defines for SPL */
-#define CONFIG_SPL_TEXT_BASE           0x40004030
 #define CONFIG_SPL_MAX_SIZE            ((128 << 10) - 0x4030)
 
 #define CONFIG_SPL_BSS_START_ADDR      (0x40000000 + (128 << 10))
@@ -92,7 +91,6 @@
 #define CONFIG_SPL_BOOTROM_SAVE                (CONFIG_SPL_STACK + 4)
 
 /* SPL related SPI defines */
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x24000
 
 /* DS414 bus width is 32bits */
 #define CONFIG_DDR_32BIT
@@ -100,7 +98,5 @@
 /* Default Environment */
 #define CONFIG_BOOTCOMMAND     "sf read ${loadaddr} 0xd0000 0x700000; bootm"
 #define CONFIG_LOADADDR                0x80000
-#undef CONFIG_PREBOOT          /* override preboot for USB and SPI flash init */
-#define CONFIG_PREBOOT         "usb start; sf probe"
 
 #endif /* _CONFIG_SYNOLOGY_DS414_H */