Merge tag 'dm-pull-18mar22' of https://source.denx.de/u-boot/custodians/u-boot-dm...

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

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index c7a7a18..62d64ff 100644 (file)
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -16,10 +16,6 @@
 
 /* settings we don;t want on this board */
 
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_TIMESTAMP
-#endif
-
 #define CONFIG_SYS_BOOTM_LEN           (16 << 20)
 
 /* Clock Defines */
@@ -28,16 +24,6 @@
 
 #define CONFIG_HSMMC2_8BIT
 
-#ifndef CONFIG_SHC_ICT
-/*
- * In builds other than ICT, reset to retry after timeout
- * Define a timeout after which a stopped bootloader continues autoboot
- * (only works with CONFIG_RESET_TO_RETRY)
- */
-# define CONFIG_BOOT_RETRY_TIME 30
-# define CONFIG_RESET_TO_RETRY
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \
@@ -172,6 +158,4 @@
 #undef CONFIG_DM_MMC
 #undef CONFIG_TIMER
 #endif
-
-#define CONFIG_NET_RETRY_COUNT         10
 #endif /* ! __CONFIG_AM335X_SHC_H */