Merge tag 'arc-fixes-for-2019.04-rc1' of git://git.denx.de/u-boot-arc

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

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 4d04f54..56931b7 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2003
  * Texas Instruments.
@@ -8,8 +9,6 @@
  * ARM Ltd.
  * Philippe Robin, <philippe.robin@arm.com>
  * Configuration for Compact Integrator board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -31,8 +30,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_BOOTDELAY       2
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock0 console=ttyAMA0 console=tty ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
 #define CONFIG_BOOTCOMMAND "tftpboot ; bootm"
 #define CONFIG_SERVERIP 192.168.1.100
 #define CONFIG_IPADDR 192.168.1.104
@@ -41,11 +38,8 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_PROMPT      "Integrator-CP # "      /* Monitor Command Prompt */
-
 #define PHYS_FLASH_SIZE                        0x01000000      /* 16MB */
 #define CONFIG_SYS_MAX_FLASH_SECT      64
-#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_SYS_MONITOR_LEN         0x00100000
 
 /*