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

[people/ms/u-boot.git] / include / configs / tec-ng.h

diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h
index cfee2c3b84e734d24bca7ee554b128c97953f669..32974249b0a0ea884fa5fa3c3d6967406810b18f 100644 (file)
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -11,11 +11,9 @@
 #include "tegra30-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT                       "Tegra30 (TEC-NG) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Tamonten™ NG Evaluation Carrier"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTD
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTD_BASE
 
@@ -38,7 +36,6 @@
 /* SPI */
 #define CONFIG_TEGRA20_SLINK
 #define CONFIG_TEGRA_SLINK_CTRLS       6
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED        24000000