u-boot-kontron: Bump revision to 1fd382a2ae2

This commit apply the following changes: - 1fd382a2ae2 Remove redundant YYLOC global declaration - 8d2e6ac9c75 kontron_mx6ul: Enable UUID command support - 358aca861bc kontron_mx6ul: Enable boot count support - 3dbb5f8ae98 kontron_mx6ul: Sync configuration using savedefconfig Remove patches applied on upstream Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
2025-07-05 05:15:24 +02:00 · 2020-05-26 10:18:56 -03:00 · 2020-05-26 10:18:56 -03:00 · ad6f952039
commit ad6f952039
parent 8bad7d778c
5 changed files with 2 additions and 161 deletions
--- a/recipes-bsp/u-boot/u-boot-kontron/0001-kontron_mx6ul-Sync-configuration-using-savedefconfig.patch
+++ b/recipes-bsp/u-boot/u-boot-kontron/0001-kontron_mx6ul-Sync-configuration-using-savedefconfig.patch
@ -1,66 +0,0 @@
-From 739ecc9b9cc03fdbc9a75cc6eb52937a9f7eb2af Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Thu, 21 May 2020 08:43:47 -0300
-Subject: [PATCH 1/3] kontron_mx6ul: Sync configuration using savedefconfig
-Organization: O.S. Systems Software LTDA.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
- configs/kontron_mx6ul_defconfig | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/configs/kontron_mx6ul_defconfig b/configs/kontron_mx6ul_defconfig
-index ecaabfb67b4..f92b2aa7b52 100644
--- a/configs/kontron_mx6ul_defconfig
-+++ b/configs/kontron_mx6ul_defconfig
-@@ -5,10 +5,14 @@ CONFIG_SPL_GPIO_SUPPORT=y
- CONFIG_SPL_LIBCOMMON_SUPPORT=y
- CONFIG_SPL_LIBGENERIC_SUPPORT=y
- CONFIG_TARGET_KONTRON_MX6UL=y
-+CONFIG_DM_GPIO=y
- CONFIG_SPL_MMC_SUPPORT=y
- CONFIG_SPL_SERIAL_SUPPORT=y
-+CONFIG_ENV_SIZE=0x10000
-+CONFIG_ENV_OFFSET=0xF0000
- CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL=y
-+CONFIG_ENV_SECT_SIZE=0x10000
- CONFIG_SPL_SPI_FLASH_SUPPORT=y
- CONFIG_SPL_SPI_SUPPORT=y
- CONFIG_SPL_TEXT_BASE=0x00908000
-@@ -34,7 +38,6 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_I2C=y
- CONFIG_CMD_MMC=y
- CONFIG_CMD_MTD=y
-CONFIG_CMD_SF=y
- CONFIG_CMD_SF_TEST=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_USB_SDP=y
-@@ -50,15 +53,11 @@ CONFIG_ENV_IS_IN_MMC=y
- CONFIG_ENV_IS_IN_SPI_FLASH=y
- CONFIG_USE_ENV_SPI_BUS=y
- CONFIG_ENV_SPI_BUS=2
-CONFIG_DM_GPIO=y
- CONFIG_DM_I2C=y
- CONFIG_DM_MMC=y
- CONFIG_FSL_USDHC=y
- CONFIG_MTD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_SPI_NAND=y
- CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH=y
- CONFIG_SPI_FLASH_MACRONIX=y
- CONFIG_SPI_FLASH_MTD=y
- CONFIG_PHYLIB=y
-@@ -87,6 +86,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
- CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
- CONFIG_CI_UDC=y
- CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_ENV_SIZE=0x10000
-CONFIG_ENV_SECT_SIZE=0x10000
-CONFIG_ENV_OFFSET=0xF0000
-- 
-2.26.2
-
--- a/recipes-bsp/u-boot/u-boot-kontron/0002-kontron_mx6ul-Enable-boot-count-support.patch
+++ b/recipes-bsp/u-boot/u-boot-kontron/0002-kontron_mx6ul-Enable-boot-count-support.patch
@ -1,29 +0,0 @@
-From 9433532e5be9ddca76fdf5bdeca3b936ebcd657c Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Thu, 21 May 2020 14:49:46 -0300
-Subject: [PATCH 2/3] kontron_mx6ul: Enable boot count support
-Organization: O.S. Systems Software LTDA.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
- configs/kontron_mx6ul_defconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configs/kontron_mx6ul_defconfig b/configs/kontron_mx6ul_defconfig
-index f92b2aa7b52..aabf348c17f 100644
--- a/configs/kontron_mx6ul_defconfig
-+++ b/configs/kontron_mx6ul_defconfig
-@@ -53,6 +53,8 @@ CONFIG_ENV_IS_IN_MMC=y
- CONFIG_ENV_IS_IN_SPI_FLASH=y
- CONFIG_USE_ENV_SPI_BUS=y
- CONFIG_ENV_SPI_BUS=2
-+CONFIG_BOOTCOUNT_LIMIT=y
-+CONFIG_BOOTCOUNT_ENV=y
- CONFIG_DM_I2C=y
- CONFIG_DM_MMC=y
- CONFIG_FSL_USDHC=y
-- 
-2.26.2
-
--- a/recipes-bsp/u-boot/u-boot-kontron/0003-kontron_mx6ul-Enable-UUID-command-support.patch
+++ b/recipes-bsp/u-boot/u-boot-kontron/0003-kontron_mx6ul-Enable-UUID-command-support.patch
@ -1,28 +0,0 @@
-From dbc3af04cf8be22cfca6be1bde99d64107946438 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Thu, 21 May 2020 15:21:51 -0300
-Subject: [PATCH 3/3] kontron_mx6ul: Enable UUID command support
-Organization: O.S. Systems Software LTDA.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
- configs/kontron_mx6ul_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configs/kontron_mx6ul_defconfig b/configs/kontron_mx6ul_defconfig
-index aabf348c17f..c25abc3e11a 100644
--- a/configs/kontron_mx6ul_defconfig
-+++ b/configs/kontron_mx6ul_defconfig
-@@ -44,6 +44,7 @@ CONFIG_CMD_USB_SDP=y
- CONFIG_CMD_USB_MASS_STORAGE=y
- CONFIG_CMD_CACHE=y
- CONFIG_CMD_EXT4_WRITE=y
-+CONFIG_CMD_FS_UUID=y
- CONFIG_CMD_UBI=y
- CONFIG_OF_CONTROL=y
- CONFIG_SPL_OF_CONTROL=y
-- 
-2.26.2
-
--- a/recipes-bsp/u-boot/u-boot-kontron/Remove-redundant-YYLOC-global-declaration.patch
+++ b/recipes-bsp/u-boot/u-boot-kontron/Remove-redundant-YYLOC-global-declaration.patch
@ -1,31 +0,0 @@
-From 94e01f12ee60f7781ec3635a147d68c1e8baccd8 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 30 Jan 2020 09:37:15 +0000
-Subject: [PATCH] Remove redundant YYLOC global declaration
-Organization: O.S. Systems Software LTDA.
-
-Same as the upstream fix for building dtc with gcc 10.
-
-Upstream-Status: Backport [2020.04]
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-(cherry picked from commit 018921ee79d3f30893614b3b2b63b588d8544f73)
---
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index fd825ebba69..24af5499775 100644
--- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
-YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
-- 
-2.26.2
-
--- a/recipes-bsp/u-boot/u-boot-kontron_2020.01.bb
+++ b/recipes-bsp/u-boot/u-boot-kontron_2020.01.bb
@ -13,13 +13,8 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"

 SRC_URI = "git://git.kontron-electronics.de/linux/u-boot.git;protocol=https;branch=${SRCBRANCH} \
           file://fw_env.config \
-           \
-           file://0001-kontron_mx6ul-Sync-configuration-using-savedefconfig.patch \
-           file://0002-kontron_mx6ul-Enable-boot-count-support.patch \
-           file://0003-kontron_mx6ul-Enable-UUID-command-support.patch \
-           \
-           file://Remove-redundant-YYLOC-global-declaration.patch"
-SRCREV = "438e0ad034813d38228ace8f1d311459933d1125"
+"
+SRCREV = "1fd382a2ae23d917a3949b4dd899ecfbaa158843"
 SRCBRANCH = "v2020.01-ktn"
 LOCALVERSION = "-ktn"