The reginfo command sounds very generic, but it's actually only used on
the PowerPC MPC5xxx. Move the command there.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
v1 -> v2:
- define normal command instead of DEFINE_SIMPLE_COMMAND in previous
series
---
arch/powerpc/mach-mpc5xxx/Kconfig | 4 ----
arch/powerpc/mach-mpc5xxx/Makefile | 2 +-
arch/powerpc/mach-mpc5xxx/reginfo.c | 13 ++++++++++++-
commands/Kconfig | 11 -----------
commands/Makefile | 1 -
commands/reginfo.c | 21 ---------------------
include/common.h | 5 -----
7 files changed, 13 insertions(+), 44 deletions(-)
delete mode 100644 commands/reginfo.c
diff --git a/arch/powerpc/mach-mpc5xxx/Kconfig b/arch/powerpc/mach-mpc5xxx/Kconfig
index e78c2fa350b1..df6d8c187459 100644
--- a/arch/powerpc/mach-mpc5xxx/Kconfig
+++ b/arch/powerpc/mach-mpc5xxx/Kconfig
@@ -7,10 +7,6 @@ config ARCH_TEXT_BASE
default 0x00000000 if RELOCATABLE
default 0x01000000 if MACH_PHYCORE_MPC5200B_TINY
-config HAS_REGINFO
- bool
- default y if ARCH_MPC5200
-
choice
prompt "Select your board"
diff --git a/arch/powerpc/mach-mpc5xxx/Makefile b/arch/powerpc/mach-mpc5xxx/Makefile
index 9fc45c08bb31..b9b4cb8e434e 100644
--- a/arch/powerpc/mach-mpc5xxx/Makefile
+++ b/arch/powerpc/mach-mpc5xxx/Makefile
@@ -8,4 +8,4 @@ obj-y += traps.o
obj-y += time.o
extra-y += start.o
obj-$(CONFIG_MPC5200) += firmware_sc_task_bestcomm.impl.o
-obj-$(CONFIG_REGINFO) += reginfo.o
+obj-$(CONFIG_COMMAND_SUPPORT) += reginfo.o
diff --git a/arch/powerpc/mach-mpc5xxx/reginfo.c b/arch/powerpc/mach-mpc5xxx/reginfo.c
index 64816faffc22..dd33a82601ac 100644
--- a/arch/powerpc/mach-mpc5xxx/reginfo.c
+++ b/arch/powerpc/mach-mpc5xxx/reginfo.c
@@ -4,9 +4,11 @@
#include <common.h>
#include <config.h>
#include <mach/mpc5xxx.h>
+#include <command.h>
+#include <complete.h>
#include <asm/io.h>
-void reginfo(void)
+static int do_reginfo(int argc, char *argv[])
{
puts ("\nMPC5200 registers\n");
printf ("MBAR=%08x\n", CFG_MBAR);
@@ -60,4 +62,13 @@ void reginfo(void)
in_be32((void*)MPC5XXX_SDRAM_CS0CFG));
printf ("\tSDRAMCS1: %08X\n",
in_be32((void*)MPC5XXX_SDRAM_CS1CFG));
+
+ return 0;
}
+
+BAREBOX_CMD_START(reginfo)
+ .cmd = do_reginfo,
+ BAREBOX_CMD_DESC("print MPC5200 register information")
+ BAREBOX_CMD_GROUP(CMD_GRP_INFO)
+ BAREBOX_CMD_COMPLETE(empty_complete)
+BAREBOX_CMD_END
diff --git a/commands/Kconfig b/commands/Kconfig
index 4a0486861186..313fa51dcadd 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -1,8 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only
-config REGINFO
- bool
-
config COMMAND_SUPPORT
bool
depends on !SHELL_NONE
@@ -247,14 +244,6 @@ config CMD_ARM_MMUINFO
SuperSection [1]: 0x0
Failure [0]: 0x0
-config CMD_REGINFO
- depends on HAS_REGINFO
- select REGINFO
- tristate
- prompt "reginfo"
- help
- Print register information.
-
config CMD_BLKSTATS
bool
depends on BLOCK
diff --git a/commands/Makefile b/commands/Makefile
index ff5d713ca72c..a98c39637cee 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_CMD_CAT) += cat.o
obj-$(CONFIG_CMD_MOUNT) += mount.o
obj-$(CONFIG_CMD_UMOUNT) += umount.o
obj-$(CONFIG_CMD_FINDMNT) += findmnt.o
-obj-$(CONFIG_CMD_REGINFO) += reginfo.o
obj-$(CONFIG_CMD_CRC) += crc.o
obj-$(CONFIG_CMD_CLEAR) += clear.o
obj-$(CONFIG_CMD_TEST) += test.o
diff --git a/commands/reginfo.c b/commands/reginfo.c
deleted file mode 100644
index bd46cf15e7de..000000000000
--- a/commands/reginfo.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: © 2007 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>, Pengutronix
-
-/* reginfo.c - print information about SoC specifc registers */
-
-#include <common.h>
-#include <command.h>
-#include <complete.h>
-
-static int do_reginfo(int argc, char *argv[])
-{
- reginfo();
- return 0;
-}
-
-BAREBOX_CMD_START(reginfo)
- .cmd = do_reginfo,
- BAREBOX_CMD_DESC("print register information")
- BAREBOX_CMD_GROUP(CMD_GRP_INFO)
- BAREBOX_CMD_COMPLETE(empty_complete)
-BAREBOX_CMD_END
diff --git a/include/common.h b/include/common.h
index dd0d6548e5db..1f00baf8067a 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,11 +23,6 @@
#include <linux/printk.h>
#include <barebox-info.h>
-/*
- * Function Prototypes
- */
-void reginfo(void);
-
/* common/memsize.c */
long get_ram_size (volatile long *, long);
--
2.39.5
