Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-samsung

[platform/kernel/u-boot.git] / include / configs / armadillo-800eva.h

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index e569296..06704e5 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -40,10 +40,6 @@
 #define SCIF4_BASE             0xe6c80000
 #define        CONFIG_SCIF_A
 
-#define CONFIG_SYS_MEMTEST_START       (ARMADILLO_800EVA_SDRAM_BASE)
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \
-                                        504 * 1024 * 1024)
-#undef CONFIG_SYS_MEMTEST_SCRATCH
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE
 
 #define CONFIG_SYS_SDRAM_BASE          (ARMADILLO_800EVA_SDRAM_BASE)
@@ -69,7 +65,6 @@
 #define CONFIG_SYS_FLASH_UNLOCK_TOUT   3000
 
 /* ENV setting */
-#define CONFIG_ENV_OVERWRITE   1
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT       0