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 cf10f306c76a6423f3a8d0a5811c7e6a0ec7d478..e79a7e98dc2597fd364371361eec2181a82d6dd8 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  * Hayden Fraser (Hayden.Fraser@freescale.com)
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _M5253DEMO_H
@@ -18,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 : .; \
@@ -77,7 +69,7 @@
                ""
 #endif
 
-#define CONFIG_HOSTNAME                M5253DEMO
+#define CONFIG_HOSTNAME                "M5253DEMO"
 
 /* I2C */
 #define CONFIG_SYS_I2C
@@ -92,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
@@ -157,14 +146,12 @@
 #define FLASH_SST6401B         0x200
 #define SST_ID_xF6401B         0x236D236D
 
-#undef CONFIG_SYS_FLASH_CFI
 #ifdef CONFIG_SYS_FLASH_CFI
 /*
  * Unable to use CFI driver, due to incompatible sector erase command by SST.
  * Amd/Atmel use 0x30 for sector erase, SST use 0x50.
  * 0x30 is block erase in SST
  */
-#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CONFIG_SYS_FLASH_SIZE            0x800000
 #      define CONFIG_SYS_FLASH_CFI_WIDTH       FLASH_CFI_16BIT
 #      define CONFIG_FLASH_CFI_LEGACY