From 35685d6d71ca4933f50633fd7dc695dbd603c56b Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sun, 27 Mar 2022 09:56:48 +0000
Subject: [PATCH] u-boot (NXP iMX8): rebase patches for 2022.04

---
 ...o-imx8mq-add-distro-boot-cmd-support.patch | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch b/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch
index 4c5689ce24..b7ee48dfa5 100644
--- a/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch
+++ b/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch
@@ -12,7 +12,7 @@ diff --git a/configs/pico-imx8mq_defconfig b/configs/pico-imx8mq_defconfig
 index e2e3a15da1..d70d7fc1cc 100644
 --- a/configs/pico-imx8mq_defconfig
 +++ b/configs/pico-imx8mq_defconfig
-@@ -57,3 +57,4 @@ CONFIG_DM_REGULATOR_GPIO=y
+@@ -83,3 +83,4 @@ CONFIG_DM_REGULATOR_GPIO=y
  CONFIG_DM_RESET=y
  CONFIG_MXC_UART=y
  CONFIG_DM_THERMAL=y
@@ -21,8 +21,8 @@ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
 index 7a5891652f..e301bc736d 100644
 --- a/include/configs/pico-imx8mq.h
 +++ b/include/configs/pico-imx8mq.h
-@@ -71,54 +71,22 @@
- #define CONFIG_PHY_ATHEROS
+@@ -41,42 +41,22 @@
+ #define IMX_FEC_BASE			0x30BE0000
  #endif
  
 -/* Initial environment variables */
@@ -36,7 +36,7 @@ index 7a5891652f..e301bc736d 100644
 -	"initrd_addr=0x43800000\0"					\
 -	"initrd_high=0xffffffffffffffff\0"				\
 -	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0"		\
--	"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0"	\
+-	"mmcpart=1\0"	\
 -	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0"			\
 -	"mmcautodetect=yes\0"						\
 -	"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 "	\
@@ -61,18 +61,6 @@ index 7a5891652f..e301bc736d 100644
 -		"fi; "							\
 -		"${get_cmd} ${loadaddr} ${image}; "			\
 -		"booti; "
--
--#define CONFIG_BOOTCOMMAND \
--	"mmc dev ${mmcdev}; if mmc rescan; then "			\
--		"if run loadbootscript; then "				\
--			"run bootscript; "				\
--		"else "							\
--			"if run loadimage; then "			\
--				"run mmcboot; "				\
--			"else run netboot; "				\
--			"fi; "						\
--		"fi; "							\
--	"else booti ${loadaddr} - ${fdt_addr}; fi"
 +#define BOOT_TARGET_DEVICES(func) \
 +        func(MMC, mmc, 1) \
 +        func(MMC, mmc, 0) \
@@ -91,7 +79,7 @@ index 7a5891652f..e301bc736d 100644
 +	BOOTENV
  
  /* Link Definitions */
- #define CONFIG_LOADADDR			0x40480000
+ 
 -- 
 2.29.2