Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index a3f704c..f50cdd7 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -52,6 +52,7 @@
 #define CONFIG_SYS_USB_HOST    /* use the EHCI USB controller */
 #endif
 
+#include <linux/stringify.h>
 #define CONFIG_RTC_DS1337
 #define CONFIG_SYS_I2C
 
@@ -144,8 +145,6 @@
  */
 #define CONFIG_SYS_SDRAM_BASE          0x00000000 /* DDR is system memory*/
 #define CONFIG_SYS_83XX_DDR_USES_CS0
-#define CONFIG_SYS_MEMTEST_START       0x1000  /* memtest region */
-#define CONFIG_SYS_MEMTEST_END         0x2000
 
 #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL  (DDR_SDRAM_CLK_CNTL_SS_EN \
                                        | DDR_SDRAM_CLK_CNTL_CLK_ADJUST_075)
@@ -209,12 +208,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 #define CONFIG_SYS_VSC7385_BASE        0xF8000000
 
-#ifdef CONFIG_VSC7385_ENET
-
-
-#endif
-
-
 #define CONFIG_SYS_LED_BASE    0xF9000000
 
 
@@ -344,17 +337,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 /*
  * Environment
  */
-#define CONFIG_ENV_OVERWRITE
-
-#ifndef CONFIG_SYS_RAMBOOT
-  #define CONFIG_ENV_ADDR      \
-                       (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
-  #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */
-  #define CONFIG_ENV_SIZE      0x2000
-#else
-  #define CONFIG_ENV_ADDR      (CONFIG_SYS_MONITOR_BASE - 0x1000)
-  #define CONFIG_ENV_SIZE      0x2000
-#endif
 
 #define CONFIG_LOADS_ECHO      /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   /* allow baudrate change */
@@ -406,7 +388,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 /*
  * Environment Configuration
  */
-#define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_NETDEV          "eth0"