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

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

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 6899eac7a4725bc31aef52a629872c518871b1d0..9eaafc538cc2cfeb1cd8e17c7a88ceb83063c5db 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Aries M53 configuration
  * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __M53EVK_CONFIG_H__
@@ -40,26 +39,21 @@
 /*
  * U-Boot general configurations
  */
-#define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O buffer size */
 #define CONFIG_SYS_MAXARGS     32              /* Max number of command args */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
                                                /* Boot argument buffer size */
-#define CONFIG_AUTO_COMPLETE                   /* Command auto complete */
-#define CONFIG_CMDLINE_EDITING                 /* Command history etc */
 
 /*
  * Serial Driver
  */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART2_BASE
-#define CONFIG_CONS_INDEX              1
 
 /*
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 #endif
@@ -189,7 +183,7 @@
  * Extra Environments
  */
 #define CONFIG_PREBOOT         "run try_bootscript"
-#define CONFIG_HOSTNAME                m53evk
+#define CONFIG_HOSTNAME                "m53evk"
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "consdev=ttymxc1\0"                                             \