Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 240bc7ed802731cc14e7e5bcf584a8e59b82a7d2..5d978747fe8ae5fc8faac0261aa607563f0275ed 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -1,4 +1,4 @@
-TABILITY or FITNESS FO04-2007 Freescale Semiconductor, Inc.
+/* Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
  * Hayden Fraser (Hayden.Fraser@freescale.com)
  *
  * SPDX-License-Identifier:    GPL-2.0+
@@ -7,8 +7,6 @@ TABILITY or FITNESS FO04-2007 Freescale Semiconductor, Inc.
 #ifndef _M5253DEMO_H
 #define _M5253DEMO_H
 
-#define CONFIG_MCF52x2         /* define processor family */
-#define CONFIG_M5253           /* define processor type */
 #define CONFIG_M5253DEMO       /* define board type */
 
 #define CONFIG_MCFTMR
@@ -34,6 +32,10 @@ TABILITY or FITNESS FO04-2007 Freescale Semiconductor, Inc.
 #      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 
+#define LDS_BOARD_TEXT \
+        . = DEFINED(env_offset) ? env_offset : .; \
+        common/env_embedded.o (.text*);
+
 /*
  * Command line configuration.
  */
@@ -107,7 +109,6 @@ TABILITY or FITNESS FO04-2007 Freescale Semiconductor, Inc.
 #define CONFIG_SYS_I2C_PINMUX_CLR      (0xFFFFE7FF)
 #define CONFIG_SYS_I2C_PINMUX_SET      (0)
 
-#define CONFIG_SYS_PROMPT              "=> "
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
 #if defined(CONFIG_CMD_KGDB)
@@ -124,8 +125,6 @@ TABILITY or FITNESS FO04-2007 Freescale Semiconductor, Inc.
 #define CONFIG_SYS_MEMTEST_START       0x400
 #define CONFIG_SYS_MEMTEST_END         0x380000
 
-#define CONFIG_SYS_HZ                  1000
-
 #undef CONFIG_SYS_PLL_BYPASS           /* bypass PLL for test purpose */
 #define CONFIG_SYS_FAST_CLK
 #ifdef CONFIG_SYS_FAST_CLK