Merge tag 'u-boot-rockchip-20190809' of https://gitlab.denx.de/u-boot/custodians...

[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 4271aca..cd7e168 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2012 Lucas Stach
  *
  * Configuration settings for the Toradex Colibri T20 modules.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -11,9 +10,6 @@
 
 #include "tegra20-common.h"
 
-/* High-level configuration options */
-#define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
-
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_TEGRA_UARTA_SDIO1
@@ -21,19 +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 */
-#define CONFIG_USB_ETHER_ASIX
-
 /* General networking support */
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          1536
 #define CONFIG_TFTP_TSIZE
 
 /* LCD support */
@@ -43,23 +27,13 @@
 #define CONFIG_TEGRA_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
-/* Dynamic MTD partition support */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT         "nand0=tegra_nand"
-#define MTDPARTS_DEFAULT       "mtdparts=tegra_nand:"          \
-                               "2m(u-boot)ro,"                 \
-                               "1m(u-boot-env),"               \
-                               "1m(cfgblock)ro,"               \
-                               "-(ubi)"
-
 /* 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=" MTDPARTS_DEFAULT "\0"
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
 
 /* Increase console I/O buffer size */
 #undef CONFIG_SYS_CBSIZE