Merge branch '2022-08-04-Kconfig-migrations'

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

diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 4a26ae8..9d06838 100644 (file)
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -69,9 +69,6 @@
 
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MAX_FLASH_SECT      35
-#define CONFIG_SYS_FLASH_ERASE_TOUT    120000
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500
 
 /*
  * For booting Linux, the board info and command line data
@@ -80,15 +77,12 @@
  */
 #define        CONFIG_SYS_BOOTMAPSZ            (8 << 20)
 #define        CONFIG_SYS_MONITOR_LEN          (320 << 10)
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 
 /* Environment Configuration */
 
 /* environment is in FLASH */
 
 /* Ethernet configuration part */
-#define CONFIG_SYS_DISCOVER_PHY                1
-#define CONFIG_MII_INIT                        1
 
 /* NAND configuration part */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1