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

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

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 77faf5fdbc25199f945c6efc5add2d6221f562a2..f3357d1e0d5dce56faaba20dfb8d2a2d650c046a 100644 (file)
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -10,19 +10,14 @@
 
 #include <linux/sizes.h>
 
-/* enable PMIC */
-#define CONFIG_MAX77620_POWER
-
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define V_PROMPT                       "Tegra210 (P2571) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA P2571"
 
 /* Board-specific serial config */
 #define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
@@ -41,9 +36,6 @@
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)
 
 /* 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
@@ -53,7 +45,7 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 
@@ -64,12 +56,7 @@
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
-/*
- * TODO(twarren@nvidia.com) - add tegra-common-usb-gadget.h back
- * breaks 64-bit build in ci_udc.c
- */
+#include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
-#define COUNTER_FREQUENCY      38400000
-
 #endif /* _P2571_H */