Merge branch 'series1_v2' of git://git.denx.de/u-boot-sparc

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

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 848ef33f20e67c761554868dd02a668ab8664675..2ab5511632e118f9d9222a1647c20145c316451f 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -12,7 +12,6 @@
 #include "tegra20-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT               "Tegra20 (TrimSlice) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Compulab Trimslice"
 
 /* Board-specific serial config */
@@ -24,7 +23,6 @@
 
 /* SPI */
 #define CONFIG_TEGRA20_SFLASH
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_CMD_SPI