diff options
author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-07-13 15:09:54 +0200 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-07-22 22:22:49 -0400 |
commit | f3603b438283aa3e47b7bc564ded4b75c6ccf051 (patch) | |
tree | 6230a611264cdcbf20c18fb87e41bd392be4f5c8 /include | |
parent | f1cd73674ff19e62c69c942f23abb061c0a26072 (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/M5208EVBE.h | 3 | ||||
-rw-r--r-- | include/configs/M52277EVB.h | 3 | ||||
-rw-r--r-- | include/configs/M5235EVB.h | 1 | ||||
-rw-r--r-- | include/configs/M53017EVB.h | 3 | ||||
-rw-r--r-- | include/configs/M5329EVB.h | 3 | ||||
-rw-r--r-- | include/configs/M5373EVB.h | 3 | ||||
-rw-r--r-- | include/configs/M54418TWR.h | 1 | ||||
-rw-r--r-- | include/configs/M54451EVB.h | 3 | ||||
-rw-r--r-- | include/configs/M54455EVB.h | 1 | ||||
-rw-r--r-- | include/configs/M5475EVB.h | 1 | ||||
-rw-r--r-- | include/configs/M5485EVB.h | 1 | ||||
-rw-r--r-- | include/configs/TQM834x.h | 2 | ||||
-rw-r--r-- | include/configs/astro_mcf5373l.h | 3 | ||||
-rw-r--r-- | include/configs/dragonboard410c.h | 1 | ||||
-rw-r--r-- | include/configs/s5p_goni.h | 1 | ||||
-rw-r--r-- | include/configs/smdkc100.h | 1 | ||||
-rw-r--r-- | include/configs/vct.h | 1 |
17 files changed, 0 insertions, 32 deletions
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index f8b1d4af38e..223439aaab7 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 fc9b26ff462..e7d99baf251 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 7247111cf59..84d3f3cfa66 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 b88c3709c60..419a0907c4d 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 999bcd94952..8261323d791 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 3a39e5031d3..68136ad095a 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 f4d970d0d86..8fb9abd79cb 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 7d6edda3614..f20aa6fc330 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 39ba94065ab..35604ad4897 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 cf9d3b8e1b9..4d250bf2a1c 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 934c9d89036..6ed73656d35 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 a79dabef613..e8aa168d72e 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 61989d6babe..e102cba2c97 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 11c842d9526..712e11725be 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 c328e43dd64..a9431cbd186 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 ab755041888..c1aace7a80b 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 7b04e65d701..9792c46bc37 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 |