| Message ID | 1501421008-5737-19-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 97e12b06af5a1a7401493d98359c49f629c6c4d3 |
| Delegated to: | Bin Meng |
| Headers | show |
On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote: > Imply Qemu-specific drivers in the platform Kconfig. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > Changes in v2: > - imply ENV_IS_NOWHERE for qemu > > arch/x86/cpu/qemu/Kconfig | 4 ++++ > configs/qemu-x86_64_defconfig | 4 ---- > configs/qemu-x86_defconfig | 4 ---- > configs/qemu-x86_efi_payload32_defconfig | 4 ---- > configs/qemu-x86_efi_payload64_defconfig | 4 ---- > 5 files changed, 4 insertions(+), 16 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Tue, Aug 1, 2017 at 5:12 PM, Simon Glass <sjg@chromium.org> wrote: > On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote: >> Imply Qemu-specific drivers in the platform Kconfig. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> >> --- >> >> Changes in v2: >> - imply ENV_IS_NOWHERE for qemu >> >> arch/x86/cpu/qemu/Kconfig | 4 ++++ >> configs/qemu-x86_64_defconfig | 4 ---- >> configs/qemu-x86_defconfig | 4 ---- >> configs/qemu-x86_efi_payload32_defconfig | 4 ---- >> configs/qemu-x86_efi_payload64_defconfig | 4 ---- >> 5 files changed, 4 insertions(+), 16 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index 6f61744..ef0fd30 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -7,6 +7,10 @@ config QEMU bool select ARCH_EARLY_INIT_R + imply ENV_IS_NOWHERE + imply E1000 + imply SYS_NS16550 + imply VIDEO_VESA if QEMU diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index 83b2dc7..c203725 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -19,7 +19,6 @@ CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y @@ -61,13 +60,10 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_E1000=y CONFIG_DEBUG_UART_BASE=0x3f8 CONFIG_DEBUG_UART_CLOCK=1843200 -CONFIG_SYS_NS16550=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index 9723db5..9a674be 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -8,7 +8,6 @@ CONFIG_GENERATE_ACPI_TABLE=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -41,11 +40,8 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_E1000=y -CONFIG_SYS_NS16550=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig index d7f1d5f..1e0f7a2 100644 --- a/configs/qemu-x86_efi_payload32_defconfig +++ b/configs/qemu-x86_efi_payload32_defconfig @@ -5,7 +5,6 @@ CONFIG_SMP=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -38,11 +37,8 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_E1000=y -CONFIG_SYS_NS16550=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y CONFIG_CONSOLE_SCROLL_LINES=5 diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig index 0d94ed0..440328f 100644 --- a/configs/qemu-x86_efi_payload64_defconfig +++ b/configs/qemu-x86_efi_payload64_defconfig @@ -5,7 +5,6 @@ CONFIG_SMP=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y -CONFIG_ENV_IS_NOWHERE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_HUSH_PARSER=y CONFIG_CMD_CPU=y @@ -39,11 +38,8 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_E1000=y -CONFIG_SYS_NS16550=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y CONFIG_FRAMEBUFFER_VESA_MODE_111=y CONFIG_CONSOLE_SCROLL_LINES=5
Imply Qemu-specific drivers in the platform Kconfig. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- Changes in v2: - imply ENV_IS_NOWHERE for qemu arch/x86/cpu/qemu/Kconfig | 4 ++++ configs/qemu-x86_64_defconfig | 4 ---- configs/qemu-x86_defconfig | 4 ---- configs/qemu-x86_efi_payload32_defconfig | 4 ---- configs/qemu-x86_efi_payload64_defconfig | 4 ---- 5 files changed, 4 insertions(+), 16 deletions(-)