Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 83d7745..8261f48 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -13,6 +13,8 @@
 #ifndef _M52277EVB_H
 #define _M52277EVB_H
 
+#include <linux/stringify.h>
+
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -90,7 +92,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #define CONFIG_SYS_I2C
@@ -103,17 +104,6 @@
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI
 #define CONFIG_SYS_SBFHDR_SIZE         0x7
-#ifdef CONFIG_CMD_SPI
-#      define CONFIG_SYS_DSPI_CS2
-
-#      define CONFIG_SYS_DSPI_CTAR0    (DSPI_CTAR_TRSZ(7) | \
-                                        DSPI_CTAR_PCSSCK_1CLK | \
-                                        DSPI_CTAR_PASC(0) | \
-                                        DSPI_CTAR_PDT(0) | \
-                                        DSPI_CTAR_CSSCK(0) | \
-                                        DSPI_CTAR_ASC(0) | \
-                                        DSPI_CTAR_DT(1))
-#endif
 
 /* Input, PCI, Flexbus, and VCO */
 #define CONFIG_EXTRA_CLOCK
@@ -156,9 +146,6 @@
 #define CONFIG_SYS_SDRAM_MODE          0x00CD0000
 #define CONFIG_SYS_SDRAM_DRV_STRENGTH  0x00
 
-#define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE + 0x400
-#define CONFIG_SYS_MEMTEST_END         ((CONFIG_SYS_SDRAM_SIZE - 3) << 20)
-
 #ifdef CONFIG_CF_SBF
 #      define CONFIG_SYS_MONITOR_BASE  (CONFIG_SYS_TEXT_BASE + 0x400)
 #else
@@ -177,9 +164,6 @@
  * Environment is not embedded in u-boot. First time runing may have env
  * crc error warning if there is no correct environment on the flash.
  */
-#ifdef CONFIG_CF_SBF
-#      define CONFIG_ENV_SPI_CS        2
-#endif
 #define CONFIG_ENV_OVERWRITE           1
 
 /*-----------------------------------------------------------------------
@@ -188,16 +172,10 @@
 #ifdef CONFIG_SYS_STMICRO_BOOT
 #      define CONFIG_SYS_FLASH_BASE    CONFIG_SYS_CS0_BASE
 #      define CONFIG_SYS_FLASH0_BASE   CONFIG_SYS_CS0_BASE
-#      define CONFIG_ENV_OFFSET        0x30000
-#      define CONFIG_ENV_SIZE          0x1000
-#      define CONFIG_ENV_SECT_SIZE     0x10000
 #endif
 #ifdef CONFIG_SYS_SPANSION_BOOT
 #      define CONFIG_SYS_FLASH_BASE    CONFIG_SYS_CS0_BASE
 #      define CONFIG_SYS_FLASH0_BASE   CONFIG_SYS_CS0_BASE
-#      define CONFIG_ENV_ADDR          (CONFIG_SYS_FLASH_BASE + 0x40000)
-#      define CONFIG_ENV_SIZE          0x1000
-#      define CONFIG_ENV_SECT_SIZE     0x8000
 #endif
 
 #ifdef CONFIG_SYS_FLASH_CFI