Merge branch '2024-03-02-assorted-updates' into next

- Assorted MediaTek, ASPEED, xenguest, s5p4418 and qemu-arm fixes
- Assorted test fixes/updates/additions.
- A few bootstd/related fixes.
- Remove common.h from some files
- Drop reiserfs
- A few other assorted fixes throughout the tree.

7 files changed, 5 insertions, 189 deletions

diff --git a/cmd/Kconfig b/cmd/Kconfig
index a86b5705174..3d204edfa3f 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -740,6 +740,7 @@ config CRC32_VERIFY
 
 config CMD_EEPROM
 	bool "eeprom - EEPROM subsystem"
+	depends on DM_I2C || SYS_I2C_LEGACY
 	help
 	  (deprecated, needs conversion to driver model)
 	  Provides commands to read and write EEPROM (Electrically Erasable
@@ -2750,15 +2751,6 @@ config MTDPARTS_DEFAULT
 	  Defines a default MTD partitioning scheme in the Linux MTD command
 	  line partitions format
 
-config CMD_REISER
-	bool "reiser - Access to reiserfs filesystems"
-	help
-	  This provides two commands which operate on a resierfs filesystem,
-	  commonly used some years ago:
-
-	    reiserls - list files
-	    reiserload - load a file
-
 config CMD_YAFFS2
 	bool "yaffs2 - Access of YAFFS2 filesystem"
 	depends on YAFFS2
diff --git a/cmd/arm/exception.c b/cmd/arm/exception.c
index 522f6dff53f..98a9795b68c 100644
--- a/cmd/arm/exception.c
+++ b/cmd/arm/exception.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2018, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 
 static int do_unaligned(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/reiser.c b/cmd/reiser.c
deleted file mode 100644
index 707167fcd59..00000000000
--- a/cmd/reiser.c
+++ /dev/null
@@ -1,171 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2003 - 2004
- * Sysgo Real-Time Solutions, AG <www.elinos.com>
- * Pavel Bartusek <[email protected]>
- */
-
-/*
- * Reiserfs support
- */
-#include <common.h>
-#include <config.h>
-#include <command.h>
-#include <env.h>
-#include <image.h>
-#include <linux/ctype.h>
-#include <asm/byteorder.h>
-#include <reiserfs.h>
-#include <part.h>
-
-#if !CONFIG_IS_ENABLED(DOS_PARTITION)
-#error DOS partition support must be selected
-#endif
-
-/* #define	REISER_DEBUG */
-
-#ifdef	REISER_DEBUG
-#define	PRINTF(fmt,args...)	printf (fmt ,##args)
-#else
-#define PRINTF(fmt,args...)
-#endif
-
-int do_reiserls(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	char *filename = "/";
-	int dev, part;
-	struct blk_desc *dev_desc = NULL;
-	struct disk_partition info;
-
-	if (argc < 3)
-		return CMD_RET_USAGE;
-
-	part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1);
-	if (part < 0)
-		return 1;
-
-	if (argc == 4) {
-	    filename = argv[3];
-	}
-
-	dev = dev_desc->devnum;
-	PRINTF("Using device %s %d:%d, directory: %s\n", argv[1], dev, part, filename);
-
-	reiserfs_set_blk_dev(dev_desc, &info);
-
-	if (!reiserfs_mount(info.size)) {
-		printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n",  argv[1], dev, part);
-		return 1;
-	}
-
-	if (reiserfs_ls (filename)) {
-		printf ("** Error reiserfs_ls() **\n");
-		return 1;
-	};
-
-	return 0;
-}
-
-U_BOOT_CMD(
-	reiserls,	4,	1,	do_reiserls,
-	"list files in a directory (default /)",
-	"<interface> <dev[:part]> [directory]\n"
-	"    - list files from 'dev' on 'interface' in a 'directory'"
-);
-
-/******************************************************************************
- * Reiserfs boot command intepreter. Derived from diskboot
- */
-int do_reiserload(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	char *filename = NULL;
-	int dev, part;
-	ulong addr = 0, filelen;
-	struct disk_partition info;
-	struct blk_desc *dev_desc = NULL;
-	unsigned long count;
-	char *addr_str;
-
-	switch (argc) {
-	case 3:
-		addr_str = env_get("loadaddr");
-		if (addr_str != NULL) {
-			addr = hextoul(addr_str, NULL);
-		} else {
-			addr = CONFIG_SYS_LOAD_ADDR;
-		}
-		filename = env_get("bootfile");
-		count = 0;
-		break;
-	case 4:
-		addr = hextoul(argv[3], NULL);
-		filename = env_get("bootfile");
-		count = 0;
-		break;
-	case 5:
-		addr = hextoul(argv[3], NULL);
-		filename = argv[4];
-		count = 0;
-		break;
-	case 6:
-		addr = hextoul(argv[3], NULL);
-		filename = argv[4];
-		count = hextoul(argv[5], NULL);
-		break;
-
-	default:
-		return CMD_RET_USAGE;
-	}
-
-	if (!filename) {
-		puts ("\n** No boot file defined **\n");
-		return 1;
-	}
-
-	part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1);
-	if (part < 0)
-		return 1;
-
-	dev = dev_desc->devnum;
-
-	printf("Loading file \"%s\" from %s device %d%c%c\n",
-		filename, argv[1], dev,
-		part ? ':' : ' ', part ? part + '0' : ' ');
-
-	reiserfs_set_blk_dev(dev_desc, &info);
-
-	if (!reiserfs_mount(info.size)) {
-		printf ("** Bad Reiserfs partition or disk - %s %d:%d **\n",  argv[1], dev, part);
-		return 1;
-	}
-
-	filelen = reiserfs_open(filename);
-	if (filelen < 0) {
-		printf("** File not found %s **\n", filename);
-		return 1;
-	}
-	if ((count < filelen) && (count != 0)) {
-	    filelen = count;
-	}
-
-	if (reiserfs_read((char *)addr, filelen) != filelen) {
-		printf("\n** Unable to read \"%s\" from %s %d:%d **\n", filename, argv[1], dev, part);
-		return 1;
-	}
-
-	/* Loading ok, update default load address */
-	image_load_addr = addr;
-
-	printf ("\n%ld bytes read\n", filelen);
-	env_set_hex("filesize", filelen);
-
-	return filelen;
-}
-
-U_BOOT_CMD(
-	reiserload,	6,	0,	do_reiserload,
-	"load binary file from a Reiser filesystem",
-	"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
-	"    - load binary file 'filename' from 'dev' on 'interface'\n"
-	"      to address 'addr' from dos filesystem"
-);
diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c
index f38f454a0b1..14ad6c440a5 100644
--- a/cmd/riscv/exception.c
+++ b/cmd/riscv/exception.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2018, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 
 static int do_compressed(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/sandbox/exception.c b/cmd/sandbox/exception.c
index c082401ce6b..cfa153da260 100644
--- a/cmd/sandbox/exception.c
+++ b/cmd/sandbox/exception.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2020, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 
 static int do_sigsegv(struct cmd_tbl *cmdtp, int flag, int argc,
diff --git a/cmd/setexpr.c b/cmd/setexpr.c
index 233471f6cb7..ab76824a32b 100644
--- a/cmd/setexpr.c
+++ b/cmd/setexpr.c
@@ -216,14 +216,12 @@ int setexpr_regex_sub(char *data, uint data_size, char *nbuf, uint nbuf_size,
 		if (res == 0) {
 			if (loop == 0) {
 				debug("%s: No match\n", data);
-				return 1;
 			} else {
-				break;
+				debug("## MATCH ## %s\n", data);
 			}
+			break;
 		}
 
-		debug("## MATCH ## %s\n", data);
-
 		if (!s)
 			return 1;
 
@@ -540,7 +538,8 @@ U_BOOT_CMD(
 	"    - For each substring matching the regular expression <r> in the\n"
 	"      string <t>, substitute the string <s>.  The result is\n"
 	"      assigned to <name>.  If <t> is not supplied, use the old\n"
-	"      value of <name>\n"
+	"      value of <name>. If no substring matching <r> is found in <t>,\n"
+	"      assign <t> to <name>.\n"
 	"setexpr name sub r s [t]\n"
 	"    - Just like gsub(), but replace only the first matching substring"
 #endif
diff --git a/cmd/x86/exception.c b/cmd/x86/exception.c
index 82faaa913e5..14b6bd6f493 100644
--- a/cmd/x86/exception.c
+++ b/cmd/x86/exception.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2018, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 
 static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc,