Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39182 )
Change subject: treewide: Replace BOARD_EMULATION_QEMU_X86 ......................................................................
treewide: Replace BOARD_EMULATION_QEMU_X86
It is equivalent to the CPU_QEMU_X86 symbol.
Change-Id: Ic16233e3d80bab62cc97fd075bdcca1780a6a2b5 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/console/Kconfig M src/device/pci_rom.c M src/drivers/emulation/qemu/Kconfig M src/mainboard/emulation/Kconfig 4 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/39182/1
diff --git a/src/console/Kconfig b/src/console/Kconfig index cc18ec3..b893698 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -280,7 +280,7 @@
config CONSOLE_QEMU_DEBUGCON bool "QEMU debug console output" - depends on BOARD_EMULATION_QEMU_X86 + depends on CPU_QEMU_X86 default y help Send coreboot debug output to QEMU's isa-debugcon device: diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c index 3676f9c..816255d 100644 --- a/src/device/pci_rom.c +++ b/src/device/pci_rom.c @@ -59,7 +59,7 @@ rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
if (rom_address == 0x00000000 || rom_address == 0xffffffff) { -#if CONFIG(BOARD_EMULATION_QEMU_X86) +#if CONFIG(CPU_QEMU_X86) if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) rom_address = 0xc0000; else diff --git a/src/drivers/emulation/qemu/Kconfig b/src/drivers/emulation/qemu/Kconfig index 58daaa44..c271825 100644 --- a/src/drivers/emulation/qemu/Kconfig +++ b/src/drivers/emulation/qemu/Kconfig @@ -1,7 +1,7 @@ config DRIVERS_EMULATION_QEMU_BOCHS bool "bochs dispi interface vga driver" default y - depends on BOARD_EMULATION_QEMU_X86 + depends on CPU_QEMU_X86 depends on MAINBOARD_DO_NATIVE_VGA_INIT select HAVE_VGA_TEXT_FRAMEBUFFER select HAVE_LINEAR_FRAMEBUFFER diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index 41804e0..9ef8df0 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -8,11 +8,6 @@
endchoice
-config BOARD_EMULATION_QEMU_X86 - bool - default y - depends on CPU_QEMU_X86 - source "src/mainboard/emulation/*/Kconfig"
config MAINBOARD_VENDOR
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39182 )
Change subject: treewide: Replace BOARD_EMULATION_QEMU_X86 ......................................................................
Patch Set 1: Code-Review+2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39182 )
Change subject: treewide: Replace BOARD_EMULATION_QEMU_X86 ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39182/1/src/device/pci_rom.c File src/device/pci_rom.c:
https://review.coreboot.org/c/coreboot/+/39182/1/src/device/pci_rom.c@62 PS1, Line 62: #if CONFIG(CPU_QEMU_X86) : if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) : rom_address = 0xc0000; : else : #endif I wonder if this still applies...
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39182 )
Change subject: treewide: Replace BOARD_EMULATION_QEMU_X86 ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39182/1/src/device/pci_rom.c File src/device/pci_rom.c:
https://review.coreboot.org/c/coreboot/+/39182/1/src/device/pci_rom.c@62 PS1, Line 62: #if CONFIG(CPU_QEMU_X86) : if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) : rom_address = 0xc0000; : else : #endif
I wonder if this still applies...
I guess it depends on the emulated video card. Not sure how well it would play when passing through a GPU.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39182 )
Change subject: treewide: Replace BOARD_EMULATION_QEMU_X86 ......................................................................
Patch Set 1: Code-Review+1
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39182 )
Change subject: treewide: Replace BOARD_EMULATION_QEMU_X86 ......................................................................
treewide: Replace BOARD_EMULATION_QEMU_X86
It is equivalent to the CPU_QEMU_X86 symbol.
Change-Id: Ic16233e3d80bab62cc97fd075bdcca1780a6a2b5 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/39182 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net --- M src/console/Kconfig M src/device/pci_rom.c M src/drivers/emulation/qemu/Kconfig M src/mainboard/emulation/Kconfig 4 files changed, 3 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve
diff --git a/src/console/Kconfig b/src/console/Kconfig index cc18ec3..b893698 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -280,7 +280,7 @@
config CONSOLE_QEMU_DEBUGCON bool "QEMU debug console output" - depends on BOARD_EMULATION_QEMU_X86 + depends on CPU_QEMU_X86 default y help Send coreboot debug output to QEMU's isa-debugcon device: diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c index 3676f9c..816255d 100644 --- a/src/device/pci_rom.c +++ b/src/device/pci_rom.c @@ -59,7 +59,7 @@ rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
if (rom_address == 0x00000000 || rom_address == 0xffffffff) { -#if CONFIG(BOARD_EMULATION_QEMU_X86) +#if CONFIG(CPU_QEMU_X86) if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA) rom_address = 0xc0000; else diff --git a/src/drivers/emulation/qemu/Kconfig b/src/drivers/emulation/qemu/Kconfig index 58daaa44..c271825 100644 --- a/src/drivers/emulation/qemu/Kconfig +++ b/src/drivers/emulation/qemu/Kconfig @@ -1,7 +1,7 @@ config DRIVERS_EMULATION_QEMU_BOCHS bool "bochs dispi interface vga driver" default y - depends on BOARD_EMULATION_QEMU_X86 + depends on CPU_QEMU_X86 depends on MAINBOARD_DO_NATIVE_VGA_INIT select HAVE_VGA_TEXT_FRAMEBUFFER select HAVE_LINEAR_FRAMEBUFFER diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig index e069cf0..45790b1 100644 --- a/src/mainboard/emulation/Kconfig +++ b/src/mainboard/emulation/Kconfig @@ -8,11 +8,6 @@
endchoice
-config BOARD_EMULATION_QEMU_X86 - bool - default y - depends on CPU_QEMU_X86 - source "src/mainboard/emulation/*/Kconfig"
config MAINBOARD_VENDOR
-
Angel Pons (Code Review) -
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)