Merge branch 'master' into next

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

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 4920896..5155aa7 100644 (file)
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -12,23 +12,12 @@
 #include "tegra210-common.h"
 
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING      "NVIDIA P2571"
+#define CFG_TEGRA_BOARD_STRING "NVIDIA P2571"
 
 /* Board-specific serial config */
-#define CONFIG_SERIAL_MULTI
-#define CONFIG_TEGRA_ENABLE_UARTA
 
 /* Environment in eMMC, at the end of 2nd "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_SYS_MMC_ENV_PART                2
-#define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE)
 
-/* SPI */
-#define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
-#define CONFIG_SF_DEFAULT_SPEED                24000000
-#define CONFIG_SPI_FLASH_SIZE          (4 << 20)
-
-#include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
 #endif /* _P2571_H */