Merge tag 'rpi-next-2020.01' of https://github.com/mbgg/u-boot

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

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 4a18c72..122294d 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -10,8 +10,6 @@
 
 #include "tegra20-common.h"
 
-/* High-level configuration options */
-
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_TEGRA_UARTA_SDIO1
@@ -19,18 +17,7 @@
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_TEGRA2
 
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        3
-
-/* USB networking support */
-
 /* General networking support */
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          1536
 #define CONFIG_TFTP_TSIZE
 
 /* LCD support */
@@ -40,12 +27,7 @@
 #define CONFIG_TEGRA_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
-/* Dynamic MTD partition support */
-
 /* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
-#define CONFIG_ENV_OFFSET              (SZ_2M)
-#undef CONFIG_ENV_SIZE         /* undef size from tegra20-common.h */
-#define CONFIG_ENV_SIZE                        (SZ_64K)
 
 #define BOARD_EXTRA_ENV_SETTINGS \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"