summaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2020-05-06 20:38:44 +0300
committerTom Rini <trini@konsulko.com>2020-05-15 17:12:41 -0400
commit98bf46f7bd90b53ef9ed31b0b1dc8ddc4db15d61 (patch)
tree47f0c86b67073af3e2046154e59b7c18ef3b086d /common/board_r.c
parent9441f8cbfe30e9addd12ad7735e36b4815be65b1 (diff)
board_r: Introduce CONFIG_PCI_INIT_R Kconfig option
With CONFIG_DM_PCI enabled, PCI buses are not enumerated at boot, as they are without that config option enabled. However, there are cases such as DM PCI-based Ethernet devices that need the PCI bus enumerated so that they can be discovered by their drivers. Currently, to solve this, some boards enumerate the pci bus using "pci enum" preboot command, while others do it manually in board files (in board_init/board_late_init/etc. functions). In order to possibly make the pci enumeration process uniform across all boards, introduce CONFIG_PCI_INIT_R Kconfig option. This change also preserves the current behavior in the !DM_PCI case (pci_init is run unconditionally at boot). Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c
index f6770f2300..96034b874e 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -232,9 +232,8 @@ static int initr_unlock_ram_in_cache(void)
#ifdef CONFIG_PCI
static int initr_pci(void)
{
-#ifndef CONFIG_DM_PCI
- pci_init();
-#endif
+ if (IS_ENABLED(CONFIG_PCI_INIT_R))
+ pci_init();
return 0;
}