reginfo command is calling mpc8xx_reginfo(), mpc85xx_reginfo()
or mpc86xx_reginfo() based on CONFIG_ symbol.
As those 3 functions can't me defined at the same time, let's
rename them mpc8xxx_reginfo() to avoid the #ifdefs
Lets all remove the #ifdefs around the U_BOOT_CMD as this
file is only compiled when CONFIG_CMD_REGINFO is defined
Signed-off-by: Christophe Leroy <christophe.le...@c-s.fr>
---
arch/powerpc/cpu/mpc85xx/cpu.c | 3 ++-
arch/powerpc/cpu/mpc86xx/cpu.c | 3 ++-
arch/powerpc/cpu/mpc8xx/reginfo.c | 3 ++-
arch/powerpc/include/asm/ppc.h | 4 ++++
cmd/reginfo.c | 20 ++------------------
5 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index e3ef4ae816..711354a868 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -23,6 +23,7 @@
#include <post.h>
#include <asm/processor.h>
#include <fsl_ddr_sdram.h>
+#include <asm/ppc.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -384,7 +385,7 @@ int cpu_mmc_init(bd_t *bis)
* Currently prints out LAWs, BR0/OR0 for LBC, CSPR/CSOR/Timing
* parameters for IFC and TLBs
*/
-void mpc85xx_reginfo(void)
+void mpc8xxx_reginfo(void)
{
print_tlbcam();
print_laws();
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 7a9570c8ec..c46cd965dd 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -13,6 +13,7 @@
#include <asm/mmu.h>
#include <mpc86xx.h>
#include <asm/fsl_law.h>
+#include <asm/ppc.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -160,7 +161,7 @@ watchdog_reset(void)
* Print out the state of various machine registers.
* Currently prints out LAWs, BR0/OR0, and BATs
*/
-void mpc86xx_reginfo(void)
+void mpc8xxx_reginfo(void)
{
print_bats();
print_laws();
diff --git a/arch/powerpc/cpu/mpc8xx/reginfo.c
b/arch/powerpc/cpu/mpc8xx/reginfo.c
index 1ba4d22bdd..62fbf151ce 100644
--- a/arch/powerpc/cpu/mpc8xx/reginfo.c
+++ b/arch/powerpc/cpu/mpc8xx/reginfo.c
@@ -8,8 +8,9 @@
#include <common.h>
#include <mpc8xx.h>
#include <asm/io.h>
+#include <asm/ppc.h>
-void mpc8xx_reginfo(void)
+void mpc8xxx_reginfo(void)
{
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;
memctl8xx_t __iomem *memctl = &immap->im_memctl;
diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index 89f08eccc7..4013ddaa74 100644
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -110,6 +110,10 @@ static inline void set_msr(unsigned long msr)
asm volatile ("mtmsr %0" : : "r" (msr));
}
+#ifdef CONFIG_CMD_REGINFO
+void mpc8xxx_reginfo(void);
+#endif
+
#endif /* !__ASSEMBLY__ */
#ifdef CONFIG_PPC
diff --git a/cmd/reginfo.c b/cmd/reginfo.c
index b364cc899a..5640b035dc 100644
--- a/cmd/reginfo.c
+++ b/cmd/reginfo.c
@@ -7,36 +7,20 @@
#include <common.h>
#include <command.h>
-#if defined(CONFIG_8xx)
-void mpc8xx_reginfo(void);
-#elif defined(CONFIG_MPC86xx)
-extern void mpc86xx_reginfo(void);
-#elif defined(CONFIG_MPC85xx)
-extern void mpc85xx_reginfo(void);
-#endif
+#include <asm/ppc.h>
static int do_reginfo(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{
-#if defined(CONFIG_8xx)
- mpc8xx_reginfo();
-
-#elif defined(CONFIG_MPC86xx)
- mpc86xx_reginfo();
-
-#elif defined(CONFIG_MPC85xx)
- mpc85xx_reginfo();
-#endif
+ mpc8xxx_reginfo();
return 0;
}
/**************************************************/
-#if defined(CONFIG_CMD_REGINFO)
U_BOOT_CMD(
reginfo, 2, 1, do_reginfo,
"print register information",
""
);
-#endif
--
2.12.0
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
