Merge tag 'ti-v2021.04-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti

- DM support for OMAP PWM backlight
- USB host mode support for AM654
- Minor SPI fixes
- Add support k2g ice board with 1GHz silicon
- Fix GTC programming for K3 devices

4 files changed, 13 insertions, 15 deletions

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 9eed0ea203a..b39a5b4ca49 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -56,6 +56,12 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
+/*
+ * If the maximum size is not declared then it is defined as
+ * CONFIG_SYS_DFU_DATA_BUF_SIZE.
+ */
+#define CONFIG_SYS_DFU_MAX_FILE_SIZE	(1024 * 1024 * 8)   /* 8 MiB */
+
 #define CONFIG_SPL_MAX_SIZE		CONFIG_SYS_K3_MAX_DOWNLODABLE_IMAGE_SIZE
 
 #define CONFIG_SYS_BOOTM_LEN		SZ_64M
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 83466b9e0cf..4471eb4f6a8 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -35,6 +35,8 @@
 			"setenv name_fdt keystone-k2g-evm.dtb; " \
 		"else if test $board_name = 66AK2GIC; then " \
 			 "setenv name_fdt keystone-k2g-ice.dtb; " \
+		"else if test $board_name = 66AK2GI1; then " \
+			 "setenv name_fdt keystone-k2g-ice.dtb; " \
 		"else if test $name_fdt = undefined; then " \
 			"echo WARNING: Could not determine device tree to use;"\
 		"fi;fi;fi;fi; setenv fdtfile ${name_fdt}\0" \
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 6879f52a0c9..3f2700d8e22 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -169,8 +169,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
 	"trymmcboot=if run switchmmc; then " \
 			"setenv mmctype fat;" \
 			"run trymmcallpartboot;" \
-			"setenv mmctype ext2;" \
-			"run trymmcallpartboot;" \
 			"setenv mmctype ext4;" \
 			"run trymmcallpartboot;" \
 		"fi\0" \
@@ -179,19 +177,10 @@ int rx51_kp_getc(struct stdio_dev *sdev);
 	"preboot=setenv mmcnum 1; setenv mmcpart 1;" \
 		"setenv mmcscriptfile bootmenu.scr;" \
 		"if run switchmmc; then " \
-			"setenv mmcdone true;" \
 			"setenv mmctype fat;" \
-			"if run scriptload; then true; else " \
-				"setenv mmctype ext2;" \
-				"if run scriptload; then true; else " \
-					"setenv mmctype ext4;" \
-					"if run scriptload; then true; else " \
-						"setenv mmcdone false;" \
-					"fi;" \
-				"fi;" \
-			"fi;" \
-			"if ${mmcdone}; then " \
-				"run scriptboot;" \
+			"if run scriptload; then run scriptboot; else " \
+				"setenv mmctype ext4;" \
+				"if run scriptload; then run scriptboot; fi;" \
 			"fi;" \
 		"fi;" \
 		"if run slide; then true; else " \
diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h
index e4b14c5ecd6..53342ce193a 100644
--- a/include/configs/pdu001.h
+++ b/include/configs/pdu001.h
@@ -37,9 +37,10 @@
 
 #define CONFIG_BOOTCOMMAND \
 	"run eval_boot_device;" \
+	"part uuid mmc ${mmc_boot}:${root_fs_partition} root_fs_partuuid;" \
 	"setenv bootargs console=${console} " \
 	"vt.global_cursor_default=0 " \
-	"root=/dev/mmcblk${mmc_boot}p${root_fs_partition} " \
+	"root=PARTUUID=${root_fs_partuuid} " \
 	"rootfstype=ext4 " \
 	"rootwait " \
 	"rootdelay=1;" \