From: Christophe Leroy <christophe.leroy@c-s.fr>
Date: Fri, 16 Mar 2018 16:20:57 +0000 (+0100)
Subject: powerpc: mpc8xx: refactorise reginfo
X-Git-Tag: v2018.05-rc2~111
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ab0d8192583a725f992279fe895653a146509bdc;p=oweals%2Fu-boot.git

powerpc: mpc8xx: refactorise reginfo

reginfo is redundant with some of the commands in immap.c, so
move reginfo into that file and remove duplicated info.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---

diff --git a/arch/powerpc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile
index 40f38923ec..35ff18a7b3 100644
--- a/arch/powerpc/cpu/mpc8xx/Makefile
+++ b/arch/powerpc/cpu/mpc8xx/Makefile
@@ -12,6 +12,5 @@ obj-y	+= cpu_init.o
 obj-$(CONFIG_OF_LIBFDT) += fdt.o
 obj-$(CONFIG_CMD_IMMAP) += immap.o
 obj-y	+= interrupts.o
-obj-$(CONFIG_CMD_REGINFO) += reginfo.o
 obj-y	+= speed.o
 obj-y	+= cache.o
diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c
index 6164de281b..8e732555ba 100644
--- a/arch/powerpc/cpu/mpc8xx/immap.c
+++ b/arch/powerpc/cpu/mpc8xx/immap.c
@@ -342,6 +342,26 @@ static int do_brginfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	return 0;
 }
 
+#ifdef CONFIG_CMD_REGINFO
+void print_reginfo(void)
+{
+	immap_t __iomem     *immap  = (immap_t __iomem *)CONFIG_SYS_IMMR;
+	sit8xx_t __iomem *timers = &immap->im_sit;
+
+	printf("\nSystem Configuration registers\n"
+		"\tIMMR\t0x%08X\n", get_immr());
+	do_siuinfo(NULL, 0, 0, NULL);
+
+	printf("Memory Controller Registers\n");
+	do_memcinfo(NULL, 0, 0, NULL);
+
+	printf("\nSystem Integration Timers\n");
+	printf("\tTBSCR\t0x%04X\tRTCSC\t0x%04X\n",
+	       in_be16(&timers->sit_tbscr), in_be16(&timers->sit_rtcsc));
+	printf("\tPISCR\t0x%04X\n", in_be16(&timers->sit_piscr));
+}
+#endif
+
 /***************************************************/
 
 U_BOOT_CMD(
diff --git a/arch/powerpc/cpu/mpc8xx/reginfo.c b/arch/powerpc/cpu/mpc8xx/reginfo.c
deleted file mode 100644
index d48ea265f8..0000000000
--- a/arch/powerpc/cpu/mpc8xx/reginfo.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * (C) Copyright 2000
- * Subodh Nijsure, SkyStream Networks, snijsure@skystream.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <mpc8xx.h>
-#include <asm/io.h>
-#include <asm/ppc.h>
-
-void print_reginfo(void)
-{
-	immap_t __iomem     *immap  = (immap_t __iomem *)CONFIG_SYS_IMMR;
-	memctl8xx_t __iomem *memctl = &immap->im_memctl;
-	sysconf8xx_t __iomem *sysconf = &immap->im_siu_conf;
-	sit8xx_t __iomem *timers = &immap->im_sit;
-
-	/* Hopefully more PowerPC  knowledgable people will add code to display
-	 * other useful registers
-	 */
-
-	printf("\nSystem Configuration registers\n"
-		"\tIMMR\t0x%08X\n", get_immr());
-
-	printf("\tSIUMCR\t0x%08X", in_be32(&sysconf->sc_siumcr));
-	printf("\tSYPCR\t0x%08X\n", in_be32(&sysconf->sc_sypcr));
-
-	printf("\tSWT\t0x%08X", in_be32(&sysconf->sc_swt));
-	printf("\tSWSR\t0x%04X\n", in_be16(&sysconf->sc_swsr));
-
-	printf("\tSIPEND\t0x%08X\tSIMASK\t0x%08X\n",
-	       in_be32(&sysconf->sc_sipend), in_be32(&sysconf->sc_simask));
-	printf("\tSIEL\t0x%08X\tSIVEC\t0x%08X\n",
-	       in_be32(&sysconf->sc_siel), in_be32(&sysconf->sc_sivec));
-	printf("\tTESR\t0x%08X\tSDCR\t0x%08X\n",
-	       in_be32(&sysconf->sc_tesr), in_be32(&sysconf->sc_sdcr));
-
-	printf("Memory Controller Registers\n");
-	printf("\tBR0\t0x%08X\tOR0\t0x%08X\n", in_be32(&memctl->memc_br0),
-	       in_be32(&memctl->memc_or0));
-	printf("\tBR1\t0x%08X\tOR1\t0x%08X\n", in_be32(&memctl->memc_br1),
-	       in_be32(&memctl->memc_or1));
-	printf("\tBR2\t0x%08X\tOR2\t0x%08X\n", in_be32(&memctl->memc_br2),
-	       in_be32(&memctl->memc_or2));
-	printf("\tBR3\t0x%08X\tOR3\t0x%08X\n", in_be32(&memctl->memc_br3),
-	       in_be32(&memctl->memc_or3));
-	printf("\tBR4\t0x%08X\tOR4\t0x%08X\n", in_be32(&memctl->memc_br4),
-	       in_be32(&memctl->memc_or4));
-	printf("\tBR5\t0x%08X\tOR5\t0x%08X\n", in_be32(&memctl->memc_br5),
-	       in_be32(&memctl->memc_or5));
-	printf("\tBR6\t0x%08X\tOR6\t0x%08X\n", in_be32(&memctl->memc_br6),
-	       in_be32(&memctl->memc_or6));
-	printf("\tBR7\t0x%08X\tOR7\t0x%08X\n", in_be32(&memctl->memc_br7),
-	       in_be32(&memctl->memc_or7));
-	printf("\n\tmamr\t0x%08X\tmbmr\t0x%08X\n", in_be32(&memctl->memc_mamr),
-	       in_be32(&memctl->memc_mbmr));
-	printf("\tmstat\t0x%04X\tmptpr\t0x%04X\n", in_be16(&memctl->memc_mstat),
-	       in_be16(&memctl->memc_mptpr));
-	printf("\tmdr\t0x%08X\n", in_be32(&memctl->memc_mdr));
-
-	printf("\nSystem Integration Timers\n");
-	printf("\tTBSCR\t0x%04X\tRTCSC\t0x%04X\n",
-	       in_be16(&timers->sit_tbscr), in_be16(&timers->sit_rtcsc));
-	printf("\tPISCR\t0x%04X\n", in_be16(&timers->sit_piscr));
-
-	/*
-	 * May be some CPM info here?
-	 */
-}