| Message ID | 20200506173847.35635-6-ovidiu.panait@windriver.com |
|---|---|
| State | Accepted |
| Commit | c60f6d668dd6c439f4a88bdce3398ac05e5f8843 |
| Headers | show |
| Series | [1/6] env: Convert CONFIG_DELAY_ENVIRONMENT to Kconfig | expand |
On Wed, May 06, 2020 at 08:38:47PM +0300, Ovidiu Panait wrote: > Enable CONFIG_PCI_INIT_R for qemux86 and qemux86-64 pci enumeration during > boot in order to eliminate the custom preboot commands in > include/configs/qemu-x86.h. > > Signed-off-by: Ovidiu Panait <ovidiu.panait at windriver.com> Applied to u-boot/master, thanks!
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 0cb123eb4a..6f722c1d23 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -34,6 +34,7 @@ CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y CONFIG_SPL_RTC_SUPPORT=y +CONFIG_PCI_INIT_R=y CONFIG_CMD_CPU=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index a562f213e1..565f232b4f 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -18,6 +18,7 @@ CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_LAST_STAGE_INIT=y +CONFIG_PCI_INIT_R=y CONFIG_CMD_CPU=y CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_NVEDIT_EFI=y diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 49e307b430..52c33600b3 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -22,8 +22,6 @@ #include <config_distro_bootcmd.h> #include <configs/x86-common.h> -#define CONFIG_PREBOOT "pci enum" - #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \
Enable CONFIG_PCI_INIT_R for qemux86 and qemux86-64 pci enumeration during boot in order to eliminate the custom preboot commands in include/configs/qemu-x86.h. Signed-off-by: Ovidiu Panait <ovidiu.panait at windriver.com> --- configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + include/configs/qemu-x86.h | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-)