Merge branch '2020-07-28-Kconfig-migrations'

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

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 1f29e3d..aeb5403 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -11,7 +11,6 @@
 #define CONFIG_CPU_SH7752      1
 
 #define CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_SHOW_BOOT_PROGRESS
 
 /* MEMORY */
 #define SH7752EVB_SDRAM_BASE           (0x40000000)
@@ -23,10 +22,6 @@
 /* SCIF */
 #define CONFIG_CONS_SCIF2      1
 
-#define CONFIG_SYS_MEMTEST_START       (SH7752EVB_SDRAM_BASE)
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \
-                                        480 * 1024 * 1024)
-#undef CONFIG_SYS_MEMTEST_SCRATCH
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE
 
 #define CONFIG_SYS_SDRAM_BASE          (SH7752EVB_SDRAM_BASE)
@@ -44,10 +39,8 @@
 #define CONFIG_SH_ETHER_PHY_ADDR       18
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK        1
 #define CONFIG_SH_ETHER_USE_GETHER     1
-#define CONFIG_BITBANGMII
 #define CONFIG_BITBANGMII_MULTI
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RGMII
-#define CONFIG_PHY_VITESSE
 
 #define SH7752EVB_ETHERNET_MAC_BASE_SPI        0x00090000
 #define SH7752EVB_SPI_SECTOR_SIZE      (64 * 1024)
@@ -63,13 +56,6 @@
 #define CONFIG_SH_MMCIF_CLK            48000000
 
 /* ENV setting */
-#define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_SECT_SIZE   (64 * 1024)
-#define CONFIG_ENV_ADDR                (0x00080000)
-#define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)
-#define CONFIG_ENV_OVERWRITE   1
-#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                "netboot=bootp; bootm\0"