diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index e3ef4ae..b3de164 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -23,6 +23,7 @@ #include #include #include +#include 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(); diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index 7a9570c..a02e872 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -13,6 +13,7 @@ #include #include #include +#include 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(); diff --git a/arch/powerpc/cpu/mpc8xx/reginfo.c b/arch/powerpc/cpu/mpc8xx/reginfo.c index 1ba4d22..277d275 100644 --- a/arch/powerpc/cpu/mpc8xx/reginfo.c +++ b/arch/powerpc/cpu/mpc8xx/reginfo.c @@ -8,8 +8,9 @@ #include #include #include +#include -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; diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h index 89f08ec..27d3b83 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 print_reginfo(void); +#endif + #endif /* !__ASSEMBLY__ */ #ifdef CONFIG_PPC diff --git a/cmd/reginfo.c b/cmd/reginfo.c index b364cc8..b23883e 100644 --- a/cmd/reginfo.c +++ b/cmd/reginfo.c @@ -7,36 +7,20 @@ #include #include -#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 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 diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index f8b1d4a..223439a 100644 --- 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 diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index fc9b26f..e7d99ba 100644 --- 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 diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 7247111..84d3f3c 100644 --- 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 diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index b88c370..419a090 100644 --- 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 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 999bcd9..8261323 100644 --- 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 diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 3a39e50..68136ad 100644 --- 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 diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index f4d970d..8fb9abd 100644 --- 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 diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 7d6edda..f20aa6f 100644 --- 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 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 39ba940..35604ad 100644 --- 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 diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index cf9d3b8..4d250bf 100644 --- 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 diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 934c9d8..6ed7365 100644 --- 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 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index a79dabe..e8aa168 100644 --- 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 diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 61989d6..e102cba 100644 --- 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 diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 11c842d..712e117 100644 --- 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 */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index c328e43..a9431cb 100644 --- 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 */ diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index ab75504..c1aace7 100644 --- 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 diff --git a/include/configs/vct.h b/include/configs/vct.h index 7b04e65..9792c46 100644 --- 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