Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 477a37ba0aef644db0507a20cdb444582282808f..23b2e436167c3a078f470c4c417c05b62fac49ab 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -16,7 +16,6 @@
 #include "tegra124-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT                       "Tegra124 (Jetson TK1) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Jetson TK1"
 
 /* Board-specific serial config */
@@ -40,9 +39,6 @@
 #define CONFIG_SYS_MMC_ENV_PART                2
 
 /* SPI */
-#define CONFIG_TEGRA114_SPI            /* Compatible w/ Tegra114 SPI */
-#define CONFIG_TEGRA114_SPI_CTRLS      6
-#define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SF_DEFAULT_SPEED                24000000
 #define CONFIG_CMD_SPI
@@ -62,10 +58,8 @@
 
 /* PCI host support */
 #define CONFIG_PCI
-#define CONFIG_PCI_TEGRA
 #define CONFIG_PCI_PNP
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_PCI_ENUM
 
 /* PCI networking support */
 #define CONFIG_RTL8169