u-boot-mainline: refresh patch to prevent fuzz warnings

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/recipes-bsp/u-boot-mainline/files/0006-colibri-apalis-tegra-drop-DFU-support.patch b/recipes-bsp/u-boot-mainline/files/0006-colibri-apalis-tegra-drop-DFU-support.patch
index 2609d96..f8393ce 100644
--- a/recipes-bsp/u-boot-mainline/files/0006-colibri-apalis-tegra-drop-DFU-support.patch
+++ b/recipes-bsp/u-boot-mainline/files/0006-colibri-apalis-tegra-drop-DFU-support.patch
@@ -1,4 +1,4 @@
-From 1686d60e877fcf86a0eaf564a47639cf7b563454 Mon Sep 17 00:00:00 2001
+From 677dcd06d90aeccfec92fd50f77494f983ad9676 Mon Sep 17 00:00:00 2001
 From: Igor Opaniuk <igor.opaniuk@toradex.com>
 Date: Fri, 14 Jun 2019 10:59:10 +0300
 Subject: [PATCH 6/7] colibri/apalis tegra: drop DFU support
@@ -16,7 +16,7 @@ Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
  4 files changed, 12 deletions(-)
 
 diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
-index 946858e48e..e62cef713a 100644
+index 41f3aff149..25f926dda3 100644
 --- a/configs/apalis-tk1_defconfig
 +++ b/configs/apalis-tk1_defconfig
 @@ -17,7 +17,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -27,9 +27,9 @@ index 946858e48e..e62cef713a 100644
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
-@@ -32,8 +31,6 @@ CONFIG_CMD_EXT4_WRITE=y
- CONFIG_OF_LIVE=y
- CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
+@@ -34,8 +33,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
+ CONFIG_IP_DEFRAG=y
+ CONFIG_TFTP_BLOCKSIZE=16352
  CONFIG_SPL_DM=y
 -CONFIG_DFU_MMC=y
 -CONFIG_DFU_RAM=y
@@ -37,7 +37,7 @@ index 946858e48e..e62cef713a 100644
  CONFIG_SUPPORT_EMMC_BOOT=y
  CONFIG_TEGRA124_MMC_DISABLE_EXT_LOOPBACK=y
 diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
-index d231ccdb49..a4af07cfc7 100644
+index cf4d14434d..75b5a1dca3 100644
 --- a/configs/apalis_t30_defconfig
 +++ b/configs/apalis_t30_defconfig
 @@ -14,7 +14,6 @@ CONFIG_ARCH_MISC_INIT=y
@@ -48,9 +48,9 @@ index d231ccdb49..a4af07cfc7 100644
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
-@@ -29,8 +28,6 @@ CONFIG_CMD_EXT4_WRITE=y
- CONFIG_OF_LIVE=y
- CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
+@@ -31,8 +30,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
+ CONFIG_IP_DEFRAG=y
+ CONFIG_TFTP_BLOCKSIZE=16352
  CONFIG_SPL_DM=y
 -CONFIG_DFU_MMC=y
 -CONFIG_DFU_RAM=y
@@ -58,7 +58,7 @@ index d231ccdb49..a4af07cfc7 100644
  CONFIG_E1000=y
  CONFIG_PCI=y
 diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
-index e652ebc5a5..199241000c 100644
+index d6a20ca642..569dda251b 100644
 --- a/configs/colibri_t20_defconfig
 +++ b/configs/colibri_t20_defconfig
 @@ -13,7 +13,6 @@ CONFIG_ARCH_MISC_INIT=y
@@ -69,9 +69,9 @@ index e652ebc5a5..199241000c 100644
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
-@@ -37,8 +36,6 @@ CONFIG_OF_LIVE=y
- CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
- CONFIG_ENV_IS_IN_NAND=y
+@@ -39,8 +38,6 @@ CONFIG_ENV_IS_IN_NAND=y
+ CONFIG_IP_DEFRAG=y
+ CONFIG_TFTP_BLOCKSIZE=1536
  CONFIG_SPL_DM=y
 -CONFIG_DFU_MMC=y
 -CONFIG_DFU_RAM=y
@@ -79,7 +79,7 @@ index e652ebc5a5..199241000c 100644
  CONFIG_MTD=y
  CONFIG_MTD_UBI_FASTMAP=y
 diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
-index 99be27823d..f9f337457d 100644
+index 769f6f3c9e..1e2268a105 100644
 --- a/configs/colibri_t30_defconfig
 +++ b/configs/colibri_t30_defconfig
 @@ -14,7 +14,6 @@ CONFIG_ARCH_MISC_INIT=y
@@ -90,9 +90,9 @@ index 99be27823d..f9f337457d 100644
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_I2C=y
-@@ -28,8 +27,6 @@ CONFIG_CMD_EXT4_WRITE=y
- CONFIG_OF_LIVE=y
- CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
+@@ -30,8 +29,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
+ CONFIG_IP_DEFRAG=y
+ CONFIG_TFTP_BLOCKSIZE=16352
  CONFIG_SPL_DM=y
 -CONFIG_DFU_MMC=y
 -CONFIG_DFU_RAM=y