Merge git://git.denx.de/u-boot-sunxi

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

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 2bdfe80..ce2af4e 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -1,14 +1,11 @@
+/* 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
 #define _M5253DEMO_H
 
-#define CONFIG_M5253DEMO       /* define board type */
-
 #define CONFIG_MCFTMR
 
 #define CONFIG_MCFUART
@@ -29,8 +26,8 @@
 #endif
 
 #define LDS_BOARD_TEXT \
-        . = DEFINED(env_offset) ? env_offset : .; \
-        common/env_embedded.o (.text*);
+       . = DEFINED(env_offset) ? env_offset : .; \
+       env/embedded.o(.text*);
 
 /*
  * Command line configuration.
@@ -79,7 +76,7 @@
                ""
 #endif
 
-#define CONFIG_HOSTNAME                M5253DEMO
+#define CONFIG_HOSTNAME                "M5253DEMO"
 
 /* I2C */
 #define CONFIG_SYS_I2C
@@ -92,17 +89,6 @@
 #define CONFIG_SYS_I2C_PINMUX_CLR      (0xFFFFE7FF)
 #define CONFIG_SYS_I2C_PINMUX_SET      (0)
 
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
-
-#if defined(CONFIG_CMD_KGDB)
-#      define CONFIG_SYS_CBSIZE                1024    /* Console I/O Buffer Size */
-#else
-#      define CONFIG_SYS_CBSIZE                256     /* Console I/O Buffer Size */
-#endif
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)     /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS             16      /* max number of command args */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size */
-
 #define CONFIG_SYS_LOAD_ADDR           0x00100000
 
 #define CONFIG_SYS_MEMTEST_START       0x400