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 c45b33a..aeb5403 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -22,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)
@@ -60,7 +56,6 @@
 #define CONFIG_SH_MMCIF_CLK            48000000
 
 /* ENV setting */
-#define CONFIG_ENV_OVERWRITE   1
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                "netboot=bootp; bootm\0"