Merge branch '2023-02-07-Kconfig-cleanup-dead-code-removal'

To quote the author:
This series adds source scanning to moveconfig.py so that it can look
for Kconfig options mentioned in the source which do not appear in
Kconfig, and vice versa.

This tool is then used to clean up the unused or obsolete options
mentioned in Makefiles, along with any attached source code.

5 files changed, 7 insertions, 438 deletions

diff --git a/cmd/Kconfig b/cmd/Kconfig
index b50e14f70a0..c7344ee1f66 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -2021,6 +2021,13 @@ config CMD_LED
 	  with led on/off/togle/blink. Any LED drivers can be controlled with
 	  this command, e.g. led_gpio.
 
+config CMD_INI
+	bool "ini"
+	help
+	  Enable the 'ini' command which allows a .ini file to be parsed and
+	  placed into environment variables. Please check the source code for
+	  this as there is no documentation.
+
 config CMD_DATE
 	bool "date"
 	default y if DM_RTC
diff --git a/cmd/Makefile b/cmd/Makefile
index b03d68d5f9b..36d2daf22a1 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -47,7 +47,6 @@ obj-$(CONFIG_CMD_CONFIG) += config.o
 obj-$(CONFIG_CMD_CONITRACE) += conitrace.o
 obj-$(CONFIG_CMD_CONSOLE) += console.o
 obj-$(CONFIG_CMD_CPU) += cpu.o
-obj-$(CONFIG_DATAFLASH_MMC_SELECT) += dataflash_mmc_mux.o
 obj-$(CONFIG_CMD_DATE) += date.o
 obj-$(CONFIG_CMD_DEMO) += demo.o
 obj-$(CONFIG_CMD_DM) += dm.o
@@ -108,7 +107,6 @@ obj-$(CONFIG_ID_EEPROM) += mac.o
 obj-$(CONFIG_CMD_MD5SUM) += md5sum.o
 obj-$(CONFIG_CMD_MEMORY) += mem.o
 obj-$(CONFIG_CMD_IO) += io.o
-obj-$(CONFIG_CMD_MFSL) += mfsl.o
 obj-$(CONFIG_CMD_MII) += mii.o
 obj-$(CONFIG_CMD_MISC) += misc.o
 obj-$(CONFIG_CMD_MDIO) += mdio.o
diff --git a/cmd/dataflash_mmc_mux.c b/cmd/dataflash_mmc_mux.c
deleted file mode 100644
index 73876e9464a..00000000000
--- a/cmd/dataflash_mmc_mux.c
+++ /dev/null
@@ -1,48 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- */
-
-#include <common.h>
-#include <command.h>
-
-static int mmc_nspi (const char *);
-
-int do_dataflash_mmc_mux(struct cmd_tbl *cmdtp, int flag, int argc,
-			 char *const argv[])
-{
-	switch (argc) {
-	case 2:			/* on / off	*/
-		switch (mmc_nspi (argv[1])) {
-		case 0:	AT91F_SelectSPI ();
-			break;
-		case 1:	AT91F_SelectMMC ();
-			break;
-		}
-	case 1:			/* get status */
-		printf ("Mux is configured to be %s\n",
-			AT91F_GetMuxStatus () ? "MMC" : "SPI");
-		return 0;
-	default:
-		return CMD_RET_USAGE;
-	}
-	return 0;
-}
-
-static int mmc_nspi (const char *s)
-{
-	if (strcmp (s, "mmc") == 0) {
-		return 1;
-	} else if (strcmp (s, "spi") == 0) {
-		return 0;
-	}
-	return -1;
-}
-
-U_BOOT_CMD(
-	dataflash_mmc_mux, 2, 1, do_dataflash_mmc_mux,
-	"enable or disable MMC or SPI\n",
-	"[mmc, spi]\n"
-	"    - enable or disable MMC or SPI"
-);
diff --git a/cmd/mfsl.c b/cmd/mfsl.c
deleted file mode 100644
index 0c78720ec46..00000000000
--- a/cmd/mfsl.c
+++ /dev/null
@@ -1,387 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2007 Michal Simek
- *
- * Michal  SIMEK <monstr@monstr.eu>
- */
-
-/*
- * Microblaze FSL support
- */
-
-#include <common.h>
-#include <config.h>
-#include <command.h>
-#include <asm/asm.h>
-
-int do_frd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	unsigned int fslnum;
-	unsigned int num;
-	unsigned int blocking;
-
-	if (argc < 2)
-		return CMD_RET_USAGE;
-
-	fslnum = (unsigned int)hextoul(argv[1], NULL);
-	blocking = (unsigned int)hextoul(argv[2], NULL);
-	if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
-		puts ("Bad number of FSL\n");
-		return CMD_RET_USAGE;
-	}
-
-	switch (fslnum) {
-#if (XILINX_FSL_NUMBER > 0)
-	case 0:
-		switch (blocking) {
-		case 0:	NGET (num, 0);
-			break;
-		case 1:	NCGET (num, 0);
-			break;
-		case 2:	GET (num, 0);
-			break;
-		case 3:	CGET (num, 0);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 1)
-	case 1:
-		switch (blocking) {
-		case 0:	NGET (num, 1);
-			break;
-		case 1:	NCGET (num, 1);
-			break;
-		case 2:	GET (num, 1);
-			break;
-		case 3:	CGET (num, 1);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 2)
-	case 2:
-		switch (blocking) {
-		case 0:	NGET (num, 2);
-			break;
-		case 1:	NCGET (num, 2);
-			break;
-		case 2:	GET (num, 2);
-			break;
-		case 3:	CGET (num, 2);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 3)
-	case 3:
-		switch (blocking) {
-		case 0:	NGET (num, 3);
-			break;
-		case 1:	NCGET (num, 3);
-			break;
-		case 2:	GET (num, 3);
-			break;
-		case 3:	CGET (num, 3);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 4)
-	case 4:
-		switch (blocking) {
-		case 0:	NGET (num, 4);
-			break;
-		case 1:	NCGET (num, 4);
-			break;
-		case 2:	GET (num, 4);
-			break;
-		case 3:	CGET (num, 4);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 5)
-	case 5:
-		switch (blocking) {
-		case 0:	NGET (num, 5);
-			break;
-		case 1:	NCGET (num, 5);
-			break;
-		case 2:	GET (num, 5);
-			break;
-		case 3:	CGET (num, 5);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 6)
-	case 6:
-		switch (blocking) {
-		case 0:	NGET (num, 6);
-			break;
-		case 1:	NCGET (num, 6);
-			break;
-		case 2:	GET (num, 6);
-			break;
-		case 3:	CGET (num, 6);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 7)
-	case 7:
-		switch (blocking) {
-		case 0:	NGET (num, 7);
-			break;
-		case 1:	NCGET (num, 7);
-			break;
-		case 2:	GET (num, 7);
-			break;
-		case 3:	CGET (num, 7);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-	default:
-		return 1;
-	}
-
-	printf ("%01x: 0x%08x - %s %s read\n", fslnum, num,
-		blocking < 2  ? "non blocking" : "blocking",
-		((blocking == 1) || (blocking == 3)) ? "control" : "data" );
-	return 0;
-}
-
-int do_fwr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	unsigned int fslnum;
-	unsigned int num;
-	unsigned int blocking;
-
-	if (argc < 3)
-		return CMD_RET_USAGE;
-
-	fslnum = (unsigned int)hextoul(argv[1], NULL);
-	num = (unsigned int)hextoul(argv[2], NULL);
-	blocking = (unsigned int)hextoul(argv[3], NULL);
-	if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER)
-		return CMD_RET_USAGE;
-
-	switch (fslnum) {
-#if (XILINX_FSL_NUMBER > 0)
-	case 0:
-		switch (blocking) {
-		case 0:	NPUT (num, 0);
-			break;
-		case 1:	NCPUT (num, 0);
-			break;
-		case 2:	PUT (num, 0);
-			break;
-		case 3:	CPUT (num, 0);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 1)
-	case 1:
-		switch (blocking) {
-		case 0:	NPUT (num, 1);
-			break;
-		case 1:	NCPUT (num, 1);
-			break;
-		case 2:	PUT (num, 1);
-			break;
-		case 3:	CPUT (num, 1);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 2)
-	case 2:
-		switch (blocking) {
-		case 0:	NPUT (num, 2);
-			break;
-		case 1:	NCPUT (num, 2);
-			break;
-		case 2:	PUT (num, 2);
-			break;
-		case 3:	CPUT (num, 2);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 3)
-	case 3:
-		switch (blocking) {
-		case 0:	NPUT (num, 3);
-			break;
-		case 1:	NCPUT (num, 3);
-			break;
-		case 2:	PUT (num, 3);
-			break;
-		case 3:	CPUT (num, 3);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 4)
-	case 4:
-		switch (blocking) {
-		case 0:	NPUT (num, 4);
-			break;
-		case 1:	NCPUT (num, 4);
-			break;
-		case 2:	PUT (num, 4);
-			break;
-		case 3:	CPUT (num, 4);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 5)
-	case 5:
-		switch (blocking) {
-		case 0:	NPUT (num, 5);
-			break;
-		case 1:	NCPUT (num, 5);
-			break;
-		case 2:	PUT (num, 5);
-			break;
-		case 3:	CPUT (num, 5);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 6)
-	case 6:
-		switch (blocking) {
-		case 0:	NPUT (num, 6);
-			break;
-		case 1:	NCPUT (num, 6);
-			break;
-		case 2:	PUT (num, 6);
-			break;
-		case 3:	CPUT (num, 6);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-#if (XILINX_FSL_NUMBER > 7)
-	case 7:
-		switch (blocking) {
-		case 0:	NPUT (num, 7);
-			break;
-		case 1:	NCPUT (num, 7);
-			break;
-		case 2:	PUT (num, 7);
-			break;
-		case 3:	CPUT (num, 7);
-			break;
-		default:
-			return 2;
-		}
-		break;
-#endif
-	default:
-		return 1;
-	}
-
-	printf ("%01x: 0x%08x - %s %s write\n", fslnum, num,
-		blocking < 2  ? "non blocking" : "blocking",
-		((blocking == 1) || (blocking == 3)) ? "control" : "data" );
-	return 0;
-
-}
-
-int do_rspr(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-	unsigned int reg = 0;
-	unsigned int val = 0;
-
-	if (argc < 2)
-		return CMD_RET_USAGE;
-
-	reg = (unsigned int)hextoul(argv[1], NULL);
-	val = (unsigned int)hextoul(argv[2], NULL);
-	switch (reg) {
-	case 0x1:
-		if (argc > 2) {
-			MTS (val, rmsr);
-			NOP;
-			MFS (val, rmsr);
-		} else {
-			MFS (val, rmsr);
-		}
-		puts ("MSR");
-		break;
-	case 0x3:
-		MFS (val, rear);
-		puts ("EAR");
-		break;
-	case 0x5:
-		MFS (val, resr);
-		puts ("ESR");
-		break;
-	default:
-		puts ("Unsupported register\n");
-		return 1;
-	}
-	printf (": 0x%08x\n", val);
-	return 0;
-}
-
-/***************************************************/
-
-U_BOOT_CMD (frd, 3, 1, do_frd,
-		"read data from FSL",
-		"- [fslnum [0|1|2|3]]\n"
-		" 0 - non blocking data read\n"
-		" 1 - non blocking control read\n"
-		" 2 - blocking data read\n"
-		" 3 - blocking control read");
-
-U_BOOT_CMD (fwr, 4, 1, do_fwr,
-		"write data to FSL",
-		"- [fslnum [0|1|2|3]]\n"
-		" 0 - non blocking data write\n"
-		" 1 - non blocking control write\n"
-		" 2 - blocking data write\n"
-		" 3 - blocking control write");
-
-U_BOOT_CMD (rspr, 3, 1, do_rspr,
-		"read/write special purpose register",
-		"- reg_num [write value] read/write special purpose register\n"
-		" 1 - MSR - Machine status register\n"
-		" 3 - EAR - Exception address register\n"
-		" 5 - ESR - Exception status register");
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 53e6b57b60e..e2a5f0089e9 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -51,7 +51,6 @@ DECLARE_GLOBAL_DATA_PTR;
 	defined(CONFIG_ENV_IS_IN_NAND)		|| \
 	defined(CONFIG_ENV_IS_IN_NVRAM)		|| \
 	defined(CONFIG_ENV_IS_IN_ONENAND)	|| \
-	defined(CONFIG_ENV_IS_IN_SATA)		|| \
 	defined(CONFIG_ENV_IS_IN_SPI_FLASH)	|| \
 	defined(CONFIG_ENV_IS_IN_REMOTE)	|| \
 	defined(CONFIG_ENV_IS_IN_UBI)