Message ID | 1465894960-12512-2-git-send-email-bmeng.cn@gmail.com |
---|---|
State | Accepted |
Commit | c0aea6ba8b008aa3e28d85d70f7fb11885d560e0 |
Delegated to: | Bin Meng |
Headers | show |
On 14 June 2016 at 02:02, Bin Meng <bmeng.cn@gmail.com> wrote: > At present should_load_oprom() calls board_should_run_oprom() to > determine whether oprom should be loaded. But sometimes we just > want to load oprom without running. Make them independent. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > drivers/pci/pci_rom.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Thu, Jun 16, 2016 at 8:40 AM, Simon Glass <sjg@chromium.org> wrote: > On 14 June 2016 at 02:02, Bin Meng <bmeng.cn@gmail.com> wrote: >> At present should_load_oprom() calls board_should_run_oprom() to >> determine whether oprom should be loaded. But sometimes we just >> want to load oprom without running. Make them independent. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> drivers/pci/pci_rom.c | 5 +---- >> 1 file changed, 1 insertion(+), 4 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86/next, thanks!
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 3ae9231..a168559 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -41,10 +41,7 @@ __weak bool board_should_run_oprom(struct udevice *dev) static bool should_load_oprom(struct udevice *dev) { - if (board_should_run_oprom(dev)) - return 1; - - return 0; + return true; } __weak uint32_t board_map_oprom_vendev(uint32_t vendev)
At present should_load_oprom() calls board_should_run_oprom() to determine whether oprom should be loaded. But sometimes we just want to load oprom without running. Make them independent. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- drivers/pci/pci_rom.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)