mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-01 09:00:45 +09:00
pci: Avoid auto-config when chain loading
When U-Boot is not the first-stage bootloader we don't want to re-configure the PCI devices, since this has already been done. Add a check to avoid this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
526aabec24
commit
f1f4438218
@ -1009,7 +1009,7 @@ static int pci_uclass_post_probe(struct udevice *bus)
|
|||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (CONFIG_IS_ENABLED(PCI_PNP) &&
|
if (CONFIG_IS_ENABLED(PCI_PNP) && ll_boot_init() &&
|
||||||
(!hose->skip_auto_config_until_reloc ||
|
(!hose->skip_auto_config_until_reloc ||
|
||||||
(gd->flags & GD_FLG_RELOC))) {
|
(gd->flags & GD_FLG_RELOC))) {
|
||||||
ret = pci_auto_config_devices(bus);
|
ret = pci_auto_config_devices(bus);
|
||||||
@ -1031,7 +1031,7 @@ static int pci_uclass_post_probe(struct udevice *bus)
|
|||||||
* Note we only call this 1) after U-Boot is relocated, and 2)
|
* Note we only call this 1) after U-Boot is relocated, and 2)
|
||||||
* root bus has finished probing.
|
* root bus has finished probing.
|
||||||
*/
|
*/
|
||||||
if ((gd->flags & GD_FLG_RELOC) && (bus->seq == 0)) {
|
if ((gd->flags & GD_FLG_RELOC) && bus->seq == 0 && ll_boot_init()) {
|
||||||
ret = fsp_init_phase_pci();
|
ret = fsp_init_phase_pci();
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user