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

[oweals/u-boot.git] / include / configs / nyan-big.h

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index b99d7627612f3d4d22d1014271f1372a80244a24..4b693e8230b9fd80f22cee1d2513d8bdfcd9b644 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -13,11 +13,9 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT                       "Tegra124 (Nyan-big) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Google/NVIDIA Nyan-big"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
@@ -53,9 +51,6 @@
 #define CONFIG_LCD_ALIGNMENT   MMU_SECTION_SIZE
 
 /* SPI */
-#define CONFIG_TEGRA114_SPI            /* Compatible w/ Tegra114 SPI */
-#define CONFIG_TEGRA114_SPI_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