Prepare v2018.07-rc1

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

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index b0f84ed852ce30a4b3b2631dadaaa4ef072ba301..68400a86fc6b07010201a47554b087e594243a09 100644 (file)
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * ti816x_evm.h
  *
  * Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com>
  * Antoine Tenart, <atenart@adeneo-embedded.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_TI816X_EVM_H
@@ -56,7 +55,6 @@
 #define CONFIG_SERIAL1
 #define CONFIG_SERIAL2
 #define CONFIG_SERIAL3
-#define CONFIG_CONS_INDEX      1
 
 /*
  * GPMC NAND block.  We support 1 device and the physical address to
@@ -99,15 +97,10 @@
 #define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \
                                         CONFIG_SPL_TEXT_BASE)
 
-#define CONFIG_SYS_TEXT_BASE        0x80800000
-
 #define CONFIG_DRIVER_TI_EMAC
 #define CONFIG_MII
-#define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT 10
 
 /* Since SPL did pll and ddr initialization for us,