Prepare v2018.07-rc1

[u-boot] / include / configs / spear-common.h

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index c123e44d1566ccd4ad6f8bc782cc08252e009a0d..7edd3b64891b1299dc67de14b8a942776cbcc684 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009
  * Vipin Kumar, STMicroelectronics, <vipin.kumar@st.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _SPEAR_COMMON_H
@@ -12,7 +11,6 @@
  */
 
 /* U-Boot Load Address */
-#define CONFIG_SYS_TEXT_BASE                   0x00700000
 
 /* Ethernet driver configuration */
 #define CONFIG_MII
@@ -77,7 +75,6 @@
  * CONFIG_PL01x_PORTS is defined in specific files
  */
 #define CONFIG_PL011_CLOCK                     (48 * 1000 * 1000)
-#define CONFIG_CONS_INDEX                      0
 #define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, \
                                                57600, 115200 }
 
@@ -165,8 +162,6 @@
 #define CONFIG_SYS_MEMTEST_START               0x00800000
 #define CONFIG_SYS_MEMTEST_END                 0x04000000
 #define CONFIG_SYS_MALLOC_LEN                  (1024*1024)
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LOAD_ADDR                   0x00800000
 
 #define CONFIG_SYS_FLASH_EMPTY_INFO