Merge tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...

[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 6c4e9d4..94e17bb 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -18,8 +18,6 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_TEGRA2
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          1536
 #define CONFIG_TFTP_TSIZE
 
 /* LCD support */
@@ -29,13 +27,14 @@
 #define CONFIG_TEGRA_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
-/* 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 UBOOT_UPDATE \
+       "update_uboot=nand erase.part u-boot && " \
+               "nand write ${loadaddr} u-boot ${filesize}\0" \
 
+/* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */
 #define BOARD_EXTRA_ENV_SETTINGS \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+       UBOOT_UPDATE
 
 /* Increase console I/O buffer size */
 #undef CONFIG_SYS_CBSIZE