From: Piotr Dymacz <pepe2k@gmail.com>
Date: Fri, 1 Apr 2022 13:11:34 +0000 (+0200)
Subject: uboot-imx: bump to 2022.01 release
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e21337589473696c37d32b3e91b503808975e59e;p=openwrt%2Fstaging%2Fxback.git

uboot-imx: bump to 2022.01 release

Two patches were removed because of the changes introduced in upstream:

1. 110-mx6cuboxi-mmc-fallback.patch
Looks like similar changes were introduced in 6c3fbf3e456c ("mx6cuboxi:
customize board_boot_order to access eMMC").

2. 111-mx6cuboxi_defconfig-force-mmc-boot.patch
The 'CONFIG_SPL_FORCE_MMC_BOOT' was removed in 15aec318ef03 ("Revert
"imx: Introduce CONFIG_SPL_FORCE_MMC_BOOT to force MMC boot on falcon
mode").

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
---

diff --git a/package/boot/uboot-imx/Makefile b/package/boot/uboot-imx/Makefile
index 2faa48bd73..d5f5555595 100644
--- a/package/boot/uboot-imx/Makefile
+++ b/package/boot/uboot-imx/Makefile
@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2020.04
+PKG_VERSION:=2022.01
 PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
+PKG_HASH:=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
 
 include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch b/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch
index 10ed918e77..ee50b071e0 100644
--- a/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch
+++ b/package/boot/uboot-imx/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch
@@ -16,22 +16,11 @@ Signed-off-by: Petr Å tetiar <ynezz@true.cz>
 
 --- a/configs/apalis_imx6_defconfig
 +++ b/configs/apalis_imx6_defconfig
-@@ -44,6 +44,7 @@ CONFIG_CMD_GPIO=y
- CONFIG_CMD_GPT=y
- CONFIG_CMD_I2C=y
- CONFIG_CMD_MMC=y
-+CONFIG_CMD_PART=y
- CONFIG_CMD_USB=y
- CONFIG_CMD_USB_SDP=y
- CONFIG_CMD_USB_MASS_STORAGE=y
-@@ -53,6 +54,10 @@ CONFIG_CMD_PMIC=y
+@@ -60,6 +60,7 @@ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_TIME=y
+ CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
- CONFIG_OF_CONTROL=y
- CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
-+CONFIG_CMD_EXT4=y
 +CONFIG_CMD_EXT4_WRITE=y
-+CONFIG_CMD_FAT=y
-+CONFIG_CMD_FS_GENERIC=y
+ CONFIG_OF_CONTROL=y
+ CONFIG_ENV_OVERWRITE=y
  CONFIG_ENV_IS_IN_MMC=y
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
diff --git a/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch
deleted file mode 100644
index 9d490ddf7e..0000000000
--- a/package/boot/uboot-imx/patches/110-mx6cuboxi-mmc-fallback.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
-+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
-@@ -286,6 +286,12 @@ static void setup_iomux_enet(void)
- 	gpio_free_list_nodev(&desc, 1);
- }
- 
-+void board_boot_order(u32 *spl_boot_list)
-+{
-+	spl_boot_list[0] = spl_boot_device();
-+	spl_boot_list[1] = BOOT_DEVICE_MMC1;
-+}
-+
- int board_phy_config(struct phy_device *phydev)
- {
- 	if (phydev->drv->config)
diff --git a/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch b/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch
deleted file mode 100644
index 4c3dc4ce20..0000000000
--- a/package/boot/uboot-imx/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 00ad8b42dfe801107db25ead8249cb10afcd0f94 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
-Date: Sun, 1 Mar 2020 22:10:23 +0100
-Subject: [PATCH] mx6cuboxi_defconfig: force mmc boot
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Å tetiar <ynezz@true.cz>
----
- configs/mx6cuboxi_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/configs/mx6cuboxi_defconfig
-+++ b/configs/mx6cuboxi_defconfig
-@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000
- CONFIG_ENV_OFFSET=0xFE000
- CONFIG_DM_GPIO=y
- CONFIG_SPL_MMC_SUPPORT=y
-+CONFIG_SPL_FORCE_MMC_BOOT=y
- CONFIG_SPL_SERIAL_SUPPORT=y
- CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL=y