powerpc: Remove unneccessary #ifdefs in reginfo

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 print_reginfo() to avoid the #ifdefs The name is kept generic as it is not at all dependent on powerpc arch and any other arch could want to also print such information. In addition, as the Makefile compiles cmd/reginfo.c only when CONFIG_CMD_REGINFO is set, there is no need to enclose the U_BOOT_CMD definition inside a #ifdef CONFIG_CMD_REGINFO Lets all remove the #ifdefs around the U_BOOT_CMD as this file is only compiled when CONFIG_CMD_REGINFO is defined Finally, this is a PowerPC-only command, disable it on a number of non-PowerPC platforms. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Tom Rini <trini@konsulko.com>
7 years ago · f3603b4382
parent f1cd73674f
commit f3603b4382
22 changed files with 12 additions and 53 deletions
--- 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 print_reginfo(void)
 {
 	print_tlbcam();
 	print_laws();
--- 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 print_reginfo(void)
 {
 	print_bats();
 	print_laws();
--- 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 print_reginfo(void)
 {
 	immap_t __iomem     *immap  = (immap_t __iomem *)CONFIG_SYS_IMMR;
 	memctl8xx_t __iomem *memctl = &immap->im_memctl;
--- 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 print_reginfo(void);
+#endif
+
 #endif /* !__ASSEMBLY__ */

 #ifdef CONFIG_PPC
--- 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
+	print_reginfo();

 	return 0;
 }

 /**************************************************/

-#if defined(CONFIG_CMD_REGINFO)
 U_BOOT_CMD(
 	reginfo,	2,	1,	do_reginfo,
 	"print register information",
 	""
 );
-#endif
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@ -20,9 +20,6 @@
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT		5000

-/* Command line configuration */
-#define CONFIG_CMD_REGINFO
-
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_MII		1
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@ -35,9 +35,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME

-/* Command line configuration */
-#define CONFIG_CMD_REGINFO
-
 #define CONFIG_HOSTNAME			M52277EVB
 #define CONFIG_SYS_UBOOT_END		0x3FFFF
 #define	CONFIG_SYS_LOAD_ADDR2		0x40010007
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@ -35,7 +35,6 @@

 /* Command line configuration */
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_REGINFO

 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@ -25,9 +25,6 @@
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT		5000

-/* Command line configuration */
-#define CONFIG_CMD_REGINFO
-
 #define CONFIG_SYS_UNIFY_CACHE

 #define CONFIG_MCFFEC
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@ -25,9 +25,6 @@
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */

-/* Command line configuration */
-#define CONFIG_CMD_REGINFO
-
 #ifdef CONFIG_NANDFLASH_SIZE
 #      define CONFIG_CMD_NAND
 #endif
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@ -25,9 +25,6 @@
 #undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */

-/* Command line configuration */
-#define CONFIG_CMD_REGINFO
-
 #ifdef CONFIG_NANDFLASH_SIZE
 #      define CONFIG_CMD_NAND
 #endif
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@ -38,7 +38,6 @@

 /* Command line configuration */
 #undef CONFIG_CMD_NAND
-#define CONFIG_CMD_REGINFO

 /*
 * NAND FLASH
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@ -35,9 +35,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME

-/* Command line configuration */
-#define CONFIG_CMD_REGINFO
-
 /* Network configuration */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@ -37,7 +37,6 @@

 /* Command line configuration */
 #undef CONFIG_CMD_PCI
-#define CONFIG_CMD_REGINFO

 /* Network configuration */
 #define CONFIG_MCFFEC
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@ -27,7 +27,6 @@

 /* Command line configuration */
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_REGINFO

 #define CONFIG_SLTTMR

--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@ -27,7 +27,6 @@

 /* Command line configuration */
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_REGINFO

 #define CONFIG_SLTTMR

--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@ -273,8 +273,6 @@
 /*
 * Command line configuration.
 */
-#define CONFIG_CMD_REGINFO
-
 #if defined(CONFIG_PCI)
    #define CONFIG_CMD_PCI
 #endif
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@ -57,9 +57,6 @@
 #define ENABLE_JFFS	1
 #endif

-/* Define which commands should be available at u-boot command prompt */
-
-#define CONFIG_CMD_REGINFO
 #define CONFIG_CMDLINE_EDITING

 #define CONFIG_MCFRTC
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@ -49,7 +49,6 @@
 /* Enable that for switching of boot partitions */
 /* Disabled by default as some sub-commands can brick eMMC */
 /*#define CONFIG_SUPPORT_EMMC_BOOT */
-#define CONFIG_CMD_REGINFO	/* Register dump		*/
 #define CONFIG_CMD_TFTP

 /* Partition table support */
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@ -51,7 +51,6 @@
 /* PWM */
 #define CONFIG_PWM			1

-#define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND

 /* USB Composite download gadget - g_dnl */
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@ -61,7 +61,6 @@
 ***********************************************************/
 #undef CONFIG_CMD_NAND

-#define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND
 #define CONFIG_CMD_MTDPARTS

--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@ -252,7 +252,6 @@ int vct_gpio_get(int pin);
 * (NOR/OneNAND) usage and Linux kernel booting.
 */
 #if defined(CONFIG_VCT_SMALL_IMAGE)
-#undef CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_STRINGS
 #undef CONFIG_CMD_TERMINAL