diff options
| author | Simon Glass <sjg@chromium.org> | 2014-04-10 20:01:31 -0600 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-29 17:49:00 -0400 |
| commit | b26440f1fa243396000536028ea00e5e185b6b6a (patch) | |
| tree | 5a49215c1ccf6fcb80d4abc476f04df39556b6d0 /common/cmd_pci.c | |
| parent | 0098e179e1afacb3cf595c67a98b8739dc7edcde (diff) | |
| download | u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.zip u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.tar.gz u-boot-imx-b26440f1fa243396000536028ea00e5e185b6b6a.tar.bz2 | |
Rename bootretry functions and remove #ifdefs
Add a bootretry_ prefix to these two functions, and remove the need for
the #ifdef around everything (it moves to the Makefile).
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_pci.c')
| -rw-r--r-- | common/cmd_pci.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/common/cmd_pci.c b/common/cmd_pci.c index 180b35a..a1ba42e 100644 --- a/common/cmd_pci.c +++ b/common/cmd_pci.c @@ -355,9 +355,8 @@ pci_cfg_modify (pci_dev_t bdf, ulong addr, ulong size, ulong value, int incrflag if (incrflag) addr += nbytes ? -size : size; nbytes = 1; -#ifdef CONFIG_BOOT_RETRY_TIME - reset_cmd_timeout(); /* good enough to not time out */ -#endif + /* good enough to not time out */ + bootretry_reset_cmd_timeout(); } #ifdef CONFIG_BOOT_RETRY_TIME else if (nbytes == -2) { @@ -369,11 +368,9 @@ pci_cfg_modify (pci_dev_t bdf, ulong addr, ulong size, ulong value, int incrflag i = simple_strtoul(console_buffer, &endp, 16); nbytes = endp - console_buffer; if (nbytes) { -#ifdef CONFIG_BOOT_RETRY_TIME /* good enough to not time out */ - reset_cmd_timeout(); -#endif + bootretry_reset_cmd_timeout(); pci_cfg_write (bdf, addr, size, i); if (incrflag) addr += size; |