Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / M5253DEMO.h

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 1199fa3151cdae9c4615a22fc302257eae56107e..e79a7e98dc2597fd364371361eec2181a82d6dd8 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -17,13 +17,6 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
-#ifdef CONFIG_MONITOR_IS_IN_RAM
-#      define CONFIG_ENV_OFFSET                0x4000
-#      define CONFIG_ENV_SECT_SIZE     0x1000
-#else
-#      define CONFIG_ENV_ADDR          (CONFIG_SYS_FLASH_BASE + 0x4000)
-#      define CONFIG_ENV_SECT_SIZE     0x1000
-#endif
 
 #define LDS_BOARD_TEXT \
        . = DEFINED(env_offset) ? env_offset : .; \
@@ -91,9 +84,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x00100000
 
-#define CONFIG_SYS_MEMTEST_START       0x400
-#define CONFIG_SYS_MEMTEST_END         0x380000
-
 #undef CONFIG_SYS_PLL_BYPASS           /* bypass PLL for test purpose */
 #define CONFIG_SYS_FAST_CLK
 #ifdef CONFIG_SYS_FAST_CLK