| Message ID | 20210802005446.2267075-26-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | pci: Drop all pre-driver model code | expand |
On Sun, Aug 01, 2021 at 06:54:38PM -0600, Simon Glass wrote: > We don't need this check anymore since when PCI is enabled, driver model > is always used. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > (no changes since v1) > > include/config_distro_bootcmd.h | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h > index e70423f25dd..9b9dd308e68 100644 > --- a/include/config_distro_bootcmd.h > +++ b/include/config_distro_bootcmd.h > @@ -265,14 +265,9 @@ > BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE > #endif > > -#if defined(CONFIG_DM_PCI) > #define BOOTENV_RUN_PCI_ENUM "run boot_pci_enum; " > #define BOOTENV_SHARED_PCI \ > "boot_pci_enum=pci enum\0" > -#else > -#define BOOTENV_RUN_PCI_ENUM > -#define BOOTENV_SHARED_PCI > -#endif > > #ifdef CONFIG_CMD_USB > #define BOOTENV_RUN_NET_USB_START "run boot_net_usb_start; " This check needs to stay and be for CONFIG_PCI now, I've fixed this locally.
On Sun, Aug 01, 2021 at 06:54:38PM -0600, Simon Glass wrote: > We don't need this check anymore since when PCI is enabled, driver model > is always used. > > Signed-off-by: Simon Glass <sjg@chromium.org> Fixed as I noted and applied to u-boot/master, thanks!
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index e70423f25dd..9b9dd308e68 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -265,14 +265,9 @@ BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE #endif -#if defined(CONFIG_DM_PCI) #define BOOTENV_RUN_PCI_ENUM "run boot_pci_enum; " #define BOOTENV_SHARED_PCI \ "boot_pci_enum=pci enum\0" -#else -#define BOOTENV_RUN_PCI_ENUM -#define BOOTENV_SHARED_PCI -#endif #ifdef CONFIG_CMD_USB #define BOOTENV_RUN_NET_USB_START "run boot_net_usb_start; "
We don't need this check anymore since when PCI is enabled, driver model is always used. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) include/config_distro_bootcmd.h | 5 ----- 1 file changed, 5 deletions(-)