Merge branch 'next'

10 files changed, 119 insertions, 86 deletions

diff --git a/cmd/Kconfig b/cmd/Kconfig
index c71c6824a19..ca1039f6a03 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -881,12 +881,12 @@ config EEPROM_LAYOUT_VERSIONS
 	  via the -l option.
 
 config EEPROM_LAYOUT_HELP_STRING
-	  string "Tells user what layout names are supported"
-	  depends on EEPROM_LAYOUT_VERSIONS
-	  default "<not defined>"
-	  help
-	    Help printed with the LAYOUT VERSIONS part of the 'eeprom'
-	    command's help.
+	string "Tells user what layout names are supported"
+	depends on EEPROM_LAYOUT_VERSIONS
+	default "<not defined>"
+	help
+	  Help printed with the LAYOUT VERSIONS part of the 'eeprom'
+	  command's help.
 
 config SYS_I2C_EEPROM_BUS
 	int "I2C bus of the EEPROM device."
@@ -967,14 +967,14 @@ config CMD_MEMORY
 	default y
 	help
 	  Memory commands.
-	    md - memory display
-	    mm - memory modify (auto-incrementing address)
-	    nm - memory modify (constant address)
-	    mw - memory write (fill)
-	    cp - memory copy
-	    cmp - memory compare
-	    base - print or set address offset
-	    loop - initialize loop on address range
+	  md - memory display
+	  mm - memory modify (auto-incrementing address)
+	  nm - memory modify (constant address)
+	  mw - memory write (fill)
+	  cp - memory copy
+	  cmp - memory compare
+	  base - print or set address offset
+	  loop - initialize loop on address range
 
 config CMD_MEM_SEARCH
 	bool "ms - Memory search"
@@ -1115,9 +1115,9 @@ config CMD_ARMFFA
 	help
 	  Provides a test command for the FF-A support
 	  supported options:
-		- Listing the partition(s) info
-		- Sending a data pattern to the specified partition
-		- Displaying the arm_ffa device info
+	  - Listing the partition(s) info
+	  - Sending a data pattern to the specified partition
+	  - Displaying the arm_ffa device info
 
 config CMD_ARMFLASH
 	bool "armflash"
@@ -1208,15 +1208,22 @@ config CMD_FASTBOOT
 
 	  See doc/android/fastboot.rst for more information.
 
+config CMD_FASTBOOT_ABORT_KEYED
+	bool "fastboot abort with any key"
+	depends on CMD_FASTBOOT && USB_FUNCTION_FASTBOOT
+	help
+	  Allow interruption of USB fastboot mode by any key presses,
+	  rather than just Ctrl-c.
+
 config CMD_FLASH
 	bool "flinfo, erase, protect"
 	default y
 	depends on FLASH_CFI_DRIVER || MTD_NOR_FLASH
 	help
 	  NOR flash support.
-	    flinfo - print FLASH memory information
-	    erase - FLASH memory
-	    protect - enable or disable FLASH write protection
+	  flinfo - print FLASH memory information
+	  erase - FLASH memory
+	  protect - enable or disable FLASH write protection
 
 config CMD_FPGA
 	bool "fpga"
@@ -1548,7 +1555,7 @@ config CMD_OPTEE
 	bool "Enable OP-TEE commands"
 	depends on OPTEE
 	help
-	 OP-TEE commands support.
+	  OP-TEE commands support.
 
 config CMD_MTD
 	bool "mtd"
@@ -1606,7 +1613,7 @@ config CMD_MUX
 	bool "mux"
 	depends on MULTIPLEXER
 	help
-	 List, select, and deselect mux controllers on the fly.
+	  List, select, and deselect mux controllers on the fly.
 
 config CMD_NAND
 	bool "nand"
@@ -1814,7 +1821,7 @@ config CMD_UFS
 	depends on UFS
 	help
 	  "This provides commands to initialise and configure universal flash
-	   subsystem devices"
+	  subsystem devices"
 
 config CMD_USB
 	bool "usb"
@@ -1871,8 +1878,8 @@ config CMD_PVBLOCK
 
 config CMD_VIRTIO
 	bool "virtio"
-	depends on VIRTIO
-	default y if VIRTIO
+	depends on VIRTIO_BLK
+	default y if VIRTIO_BLK
 	help
 	  VirtIO block device support
 
@@ -1936,7 +1943,7 @@ config CMD_SETEXPR
 	default y
 	help
 	  Evaluate boolean and math expressions and store the result in an env
-	    variable.
+	  variable.
 	  Also supports loading the value at a memory location into a variable.
 	  If CONFIG_REGEX is enabled, setexpr also supports a gsub function.
 
@@ -2642,9 +2649,9 @@ config CMD_PSTORE_ECC_SIZE
 	depends on CMD_PSTORE
 	default "0"
 	help
-	if non-zero, the option enables ECC support and specifies ECC buffer
-	size in bytes (1 is a special value, means 16 bytes ECC), should be
-	identical to ramoops.ramoops_ecc parameter used by kernel
+	  if non-zero, the option enables ECC support and specifies ECC buffer
+	  size in bytes (1 is a special value, means 16 bytes ECC), should be
+	  identical to ramoops.ramoops_ecc parameter used by kernel
 
 endif
 
@@ -3156,15 +3163,15 @@ config CMD_AVB
 	help
 	  Enables a "avb" command to perform verification of partitions using
 	  Android Verified Boot 2.0 functionality. It includes such subcommands:
-	    avb init - initialize avb2 subsystem
-	    avb read_rb - read rollback index
-	    avb write_rb - write rollback index
-	    avb is_unlocked - check device lock state
-	    avb get_uuid - read and print uuid of a partition
-	    avb read_part - read data from partition
-	    avb read_part_hex - read data from partition and output to stdout
-	    avb write_part - write data to partition
-	    avb verify - run full verification chain
+	  avb init - initialize avb2 subsystem
+	  avb read_rb - read rollback index
+	  avb write_rb - write rollback index
+	  avb is_unlocked - check device lock state
+	  avb get_uuid - read and print uuid of a partition
+	  avb read_part - read data from partition
+	  avb read_part_hex - read data from partition and output to stdout
+	  avb write_part - write data to partition
+	  avb verify - run full verification chain
 
 config CMD_STACKPROTECTOR_TEST
 	bool "Test command for stack protector"
@@ -3194,7 +3201,7 @@ config CMD_UBI_RENAME
 	depends on CMD_UBI
 	help
 	  Enable a "ubi" command to rename ubi volume:
-	   ubi rename <oldname> <newname>
+	  ubi rename <oldname> <newname>
 
 config CMD_UBIFS
 	tristate "Enable UBIFS - Unsorted block images filesystem commands"
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index ddf77303735..bf1eca75904 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -77,15 +77,15 @@ void bdinfo_print_mhz(const char *name, unsigned long hz)
 	printf("%-12s= %6s MHz\n", name, strmhz(buf, hz));
 }
 
-static void print_bi_dram(const struct bd_info *bd)
+static void print_dram(const struct bd_info *bd)
 {
 	int i;
 
 	for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
-		if (bd->bi_dram[i].size) {
+		if (gd->dram[i].size) {
 			bdinfo_print_num_l("DRAM bank",	i);
-			bdinfo_print_num_ll("-> start",	bd->bi_dram[i].start);
-			bdinfo_print_num_ll("-> size",	bd->bi_dram[i].size);
+			bdinfo_print_num_ll("-> start",	gd->dram[i].start);
+			bdinfo_print_num_ll("-> size",	gd->dram[i].size);
 		}
 	}
 }
@@ -144,7 +144,7 @@ static int bdinfo_print_all(struct bd_info *bd)
 	bdinfo_print_num_l("bd address", (ulong)bd);
 #endif
 	bdinfo_print_num_l("boot_params", (ulong)bd->bi_boot_params);
-	print_bi_dram(bd);
+	print_dram(bd);
 	bdinfo_print_num_l("flashstart", (ulong)bd->bi_flashstart);
 	bdinfo_print_num_l("flashsize", (ulong)bd->bi_flashsize);
 	bdinfo_print_num_l("flashoffset", (ulong)bd->bi_flashoffset);
@@ -199,7 +199,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 			print_eth();
 			return CMD_RET_SUCCESS;
 		case 'm':
-			print_bi_dram(bd);
+			print_dram(bd);
 			return CMD_RET_SUCCESS;
 		default:
 			return CMD_RET_USAGE;
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 528afd221d0..b55f5579409 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -526,7 +526,7 @@ static void handle_uefi_bootnext(void)
  */
 static enum bootmenu_ret bootmenu_show(int uefi, int delay)
 {
-	int cmd_ret;
+	int cmd_ret = CMD_RET_SUCCESS;
 	int init = 0;
 	void *choice = NULL;
 	char *title = NULL;
@@ -628,7 +628,7 @@ cleanup:
 		printf(ANSI_CURSOR_POSITION, 1, 1);
 	}
 
-	if (title && command) {
+	if (title && command && *command) {
 		debug("Starting entry '%s'\n", title);
 		free(title);
 		if (efi_ret == EFI_SUCCESS)
diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c
index 7b60e415b6c..66a5f6d5210 100644
--- a/cmd/cros_ec.c
+++ b/cmd/cros_ec.c
@@ -13,7 +13,7 @@
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 
-/* Note: depends on enum ec_current_image */
+/* Note: depends on enum ec_image */
 static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"};
 
 /**
@@ -312,7 +312,7 @@ static int do_cros_ec(struct cmd_tbl *cmdtp, int flag, int argc,
 		if (ret)
 			printf("Error: %d\n", ret);
 	} else if (0 == strcmp("curimage", cmd)) {
-		enum ec_current_image image;
+		enum ec_image image;
 
 		if (cros_ec_read_current_image(dev, &image)) {
 			debug("%s: Could not read KBC image\n", __func__);
diff --git a/cmd/date.c b/cmd/date.c
index d047872289c..67cfaed0d48 100644
--- a/cmd/date.c
+++ b/cmd/date.c
@@ -16,7 +16,7 @@ static const char * const weekdays[] = {
 	"Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
 };
 
-int mk_date (const char *, struct rtc_time *);
+static int mk_date(const char *, struct rtc_time *);
 
 static struct rtc_time default_tm = { 0, 0, 0, 1, 1, 2000, 6, 0, 0 };
 
@@ -117,7 +117,7 @@ static int cnvrt2 (const char *str, int *valp)
  * Some basic checking for valid values is done, but this will not catch
  * all possible error conditions.
  */
-int mk_date (const char *datestr, struct rtc_time *tmp)
+static int mk_date(const char *datestr, struct rtc_time *tmp)
 {
 	int len, val;
 	char *ptr;
@@ -167,12 +167,13 @@ int mk_date (const char *datestr, struct rtc_time *tmp)
 		/* fall thru */
 	case 12:		/* MMDDhhmmCCYY	*/
 		if (cnvrt2 (datestr+0, &val) ||
-		    val > 12) {
+		    val > 12 || val < 1) {
 			break;
 		}
 		tmp->tm_mon  = val;
-		if (cnvrt2 (datestr+2, &val) ||
-		    val > ((tmp->tm_mon==2) ? 29 : 31)) {
+		if (cnvrt2(datestr + 2, &val) ||
+		    val < 1 ||
+		    val > rtc_month_days(tmp->tm_mon - 1, tmp->tm_year)) {
 			break;
 		}
 		tmp->tm_mday = val;
diff --git a/cmd/fastboot.c b/cmd/fastboot.c
index e71f873527b..f3929f88dfa 100644
--- a/cmd/fastboot.c
+++ b/cmd/fastboot.c
@@ -103,8 +103,15 @@ static int do_fastboot_usb(int argc, char *const argv[],
 	while (1) {
 		if (g_dnl_detach())
 			break;
-		if (ctrlc())
+		if (IS_ENABLED(CONFIG_CMD_FASTBOOT_ABORT_KEYED)) {
+			if (tstc()) {
+				getchar();
+				puts("\rOperation aborted.\n");
+				break;
+			}
+		} else if (ctrlc()) {
 			break;
+		}
 		schedule();
 		dm_usb_gadget_handle_interrupts(udc);
 	}
diff --git a/cmd/mmc.c b/cmd/mmc.c
index 81b1ca4ad84..54c799891e1 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -519,7 +519,7 @@ static int do_mmc_rescan(struct cmd_tbl *cmdtp, int flag,
 
 	if (argc == 1) {
 		mmc = init_mmc_device(curr_device, true);
-	} else if (argc == 2) {
+	} else if ((argc == 2) && (CONFIG_IS_ENABLED(MMC_SPEED_MODE_SET))) {
 		enum bus_mode speed_mode;
 
 		speed_mode = (int)dectoul(argv[1], NULL);
@@ -564,11 +564,13 @@ static int do_mmc_dev(struct cmd_tbl *cmdtp, int flag,
 
 	switch (argc) {
 	case 4:
-		speed_mode = (int)dectoul(argv[3], &endp);
-		if (*endp) {
-			printf("Invalid speed mode index '%s', did you specify a mode name?\n",
-			       argv[3]);
-			return CMD_RET_USAGE;
+		if (CONFIG_IS_ENABLED(MMC_SPEED_MODE_SET)) {
+			speed_mode = (int)dectoul(argv[3], &endp);
+			if (*endp) {
+				printf("Invalid speed mode index '%s', did you specify a mode name?\n",
+				       argv[3]);
+				return CMD_RET_USAGE;
+			}
 		}
 
 		fallthrough;
@@ -1312,12 +1314,17 @@ U_BOOT_CMD(
 #endif
 	"mmc erase blk# cnt\n"
 	"mmc erase partname\n"
+#if CONFIG_IS_ENABLED(MMC_SPEED_MODE_SET)
 	"mmc rescan [mode]\n"
-	"mmc part - lists available partition on current mmc device\n"
 	"mmc dev [dev] [part] [mode] - show or set current mmc device [partition] and set mode\n"
 	"  - the required speed mode is passed as the index from the following list\n"
 	"    [MMC_LEGACY, MMC_HS, SD_HS, MMC_HS_52, MMC_DDR_52, UHS_SDR12, UHS_SDR25,\n"
 	"    UHS_SDR50, UHS_DDR50, UHS_SDR104, MMC_HS_200, MMC_HS_400, MMC_HS_400_ES]\n"
+#else
+	"mmc rescan\n"
+	"mmc dev [dev] [part] - show or set current mmc device [partition]\n"
+#endif
+	"mmc part - lists available partition on current mmc device\n"
 	"mmc list - lists available devices\n"
 	"mmc wp [PART] - power on write protect boot partitions\n"
 	"  arguments:\n"
diff --git a/cmd/ti/Kconfig b/cmd/ti/Kconfig
index 43fe9ef2f08..17cf867dd91 100644
--- a/cmd/ti/Kconfig
+++ b/cmd/ti/Kconfig
@@ -4,24 +4,24 @@ config CMD_DDR3
 	bool "command for verifying DDR features"
 	depends on ARCH_KEYSTONE || DRA7XX
 	help
-	   Support for testing ddr3 on TI platforms. This command
-	   supports memory verification, memory comapre and ecc
-	   verification if supported.
+	  Support for testing ddr3 on TI platforms. This command
+	  supports memory verification, memory comapre and ecc
+	  verification if supported.
 
 config CMD_DDR4
 	bool "command for verifying DDRSS Inline ECC features"
 	depends on ARCH_K3
 	help
-	   Support for testing DDRSS on TI platforms. This command supports
-	   memory verification, memory compare and inline ECC verification
-	   if supported.
+	  Support for testing DDRSS on TI platforms. This command supports
+	  memory verification, memory compare and inline ECC verification
+	  if supported.
 
 config CMD_PD
 	bool "command for verifying power domains"
 	depends on TI_POWER_DOMAIN
 	help
-	   Debug command for K3 power domains. For this to work, the
-	   K3 power domain driver must be enabled for the u-boot; by
-	   default it is only enabled for SPL.
+	  Debug command for K3 power domains. For this to work, the
+	  K3 power domain driver must be enabled for the u-boot; by
+	  default it is only enabled for SPL.
 
 endmenu
diff --git a/cmd/ti/ddr4.c b/cmd/ti/ddr4.c
index a8d71d11a91..36277cc154c 100644
--- a/cmd/ti/ddr4.c
+++ b/cmd/ti/ddr4.c
@@ -227,10 +227,10 @@ static int do_ddr4_ecc_inject(struct cmd_tbl *cmdtp, int flag, int argc,
 		return CMD_RET_FAILURE;
 	}
 
-	if (!((start_addr >= gd->bd->bi_dram[0].start &&
-	       (start_addr <= (gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size - 1))) ||
-	      (start_addr >= gd->bd->bi_dram[1].start &&
-	       (start_addr <= (gd->bd->bi_dram[1].start + gd->bd->bi_dram[1].size - 1))))) {
+	if (!((start_addr >= gd->dram[0].start &&
+	       (start_addr <= (gd->dram[0].start + gd->dram[0].size - 1))) ||
+	      (start_addr >= gd->dram[1].start &&
+	       (start_addr <= (gd->dram[1].start + gd->dram[1].size - 1))))) {
 		puts("Address is not in the DDR range\n");
 		return CMD_RET_FAILURE;
 	}
diff --git a/cmd/ufetch.c b/cmd/ufetch.c
index f8dc904bdd0..763ab42c48a 100644
--- a/cmd/ufetch.c
+++ b/cmd/ufetch.c
@@ -157,26 +157,37 @@ static int do_ufetch(struct cmd_tbl *cmdtp, int flag, int argc,
 				printf(" (%d baud)", gd->baudrate);
 			putc('\n');
 			break;
-		case FEATURES:
+		case FEATURES: {
+			const char *sep = "";
+
 			printf("Features:" RESET " ");
-			if (IS_ENABLED(CONFIG_NET_LEGACY))
-				printf("Net");
-			if (IS_ENABLED(CONFIG_EFI_LOADER))
-				printf(", EFI");
-			if (IS_ENABLED(CONFIG_CMD_CAT))
-				printf(", cat :3");
+			if (IS_ENABLED(CONFIG_NET)) {
+				printf("%sNet", sep);
+				sep = ", ";
+			}
+			if (IS_ENABLED(CONFIG_EFI_LOADER)) {
+				printf("%sEFI", sep);
+				sep = ", ";
+			}
+			if (IS_ENABLED(CONFIG_CMD_CAT)) {
+				printf("%scat :3", sep);
+				sep = ", ";
+			}
 #ifdef CONFIG_ARM64
 			switch (current_el()) {
 			case 2:
-				printf(", VMs");
+				printf("%sVMs", sep);
+				sep = ", ";
 				break;
 			case 3:
-				printf(", full control!");
+				printf("%sfull control!", sep);
+				sep = ", ";
 				break;
 			}
 #endif
 			printf("\n");
 			break;
+		}
 		case RELOCATION:
 			if (gd->flags & GD_FLG_SKIP_RELOC)
 				printf("Relocated:" RESET " no\n");
@@ -191,8 +202,8 @@ static int do_ufetch(struct cmd_tbl *cmdtp, int flag, int argc,
 			printf("CPU: " RESET CONFIG_SYS_ARCH " (%d cores, 1 in use)\n", n_cpus);
 			break;
 		case MEMORY:
-			for (int j = 0; j < CONFIG_NR_DRAM_BANKS && gd->bd->bi_dram[j].size; j++)
-				size += gd->bd->bi_dram[j].size;
+			for (int j = 0; j < CONFIG_NR_DRAM_BANKS && gd->dram[j].size; j++)
+				size += gd->dram[j].size;
 			printf("Memory:" RESET " ");
 			print_size(size, "\n");
 			break;