x86: Support QEMU x86 targets
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 2/6 x86: Support QEMU x86 targets
This commit introduces the initial U-Boot support for QEMU x86 targets. U-Boot can boot from coreboot as a payload, or directly without coreboot.
---
Changes in v2: None
arch/x86/Kconfig | 5 +++ arch/x86/cpu/Makefile | 1 + arch/x86/cpu/qemu/Kconfig | 21 +++++++++++++ arch/x86/cpu/qemu/Makefile | 8 +++++ arch/x86/cpu/qemu/car.S | 26 ++++++++++++++++ arch/x86/cpu/qemu/dram.c | 46 ++++++++++++++++++++++++++++ arch/x86/cpu/qemu/pci.c | 49 ++++++++++++++++++++++++++++++ arch/x86/cpu/qemu/qemu.c | 37 +++++++++++++++++++++++ arch/x86/dts/Makefile | 3 +- arch/x86/dts/qemu-x86.dts | 34 +++++++++++++++++++++ arch/x86/include/asm/arch-qemu/gpio.h | 13 ++++++++ arch/x86/include/asm/arch-qemu/qemu.h | 17 +++++++++++ board/emulation/Kconfig | 25 +++++++++++++++ board/emulation/qemu-x86/Kconfig | 24 +++++++++++++++ board/emulation/qemu-x86/MAINTAINERS | 6 ++++ board/emulation/qemu-x86/Makefile | 7 +++++ board/emulation/qemu-x86/qemu-x86.c | 13 ++++++++ board/emulation/qemu-x86/start.S | 9 ++++++ configs/qemu-x86_defconfig | 6 ++++ include/configs/qemu-x86.h | 57 +++++++++++++++++++++++++++++++++++ 20 files changed, 406 insertions(+), 1 deletion(-) create mode 100644 arch/x86/cpu/qemu/Kconfig create mode 100644 arch/x86/cpu/qemu/Makefile create mode 100644 arch/x86/cpu/qemu/car.S create mode 100644 arch/x86/cpu/qemu/dram.c create mode 100644 arch/x86/cpu/qemu/pci.c create mode 100644 arch/x86/cpu/qemu/qemu.c create mode 100644 arch/x86/dts/qemu-x86.dts create mode 100644 arch/x86/include/asm/arch-qemu/gpio.h create mode 100644 arch/x86/include/asm/arch-qemu/qemu.h create mode 100644 board/emulation/Kconfig create mode 100644 board/emulation/qemu-x86/Kconfig create mode 100644 board/emulation/qemu-x86/MAINTAINERS create mode 100644 board/emulation/qemu-x86/Makefile create mode 100644 board/emulation/qemu-x86/qemu-x86.c create mode 100644 board/emulation/qemu-x86/start.S create mode 100644 configs/qemu-x86_defconfig create mode 100644 include/configs/qemu-x86.h
arch/x86/Kconfig +5 -0
@@ -17,6 +17,9 @@ choice config VENDOR_COREBOOT bool "coreboot" +config VENDOR_EMULATION + bool "emulation" + config VENDOR_GOOGLE bool "Google"
@@ -27,6 +30,7 @@ endchoice # board-specific options below source "board/coreboot/Kconfig" +source "board/emulation/Kconfig" source "board/google/Kconfig" source "board/intel/Kconfig"
@@ -34,6 +38,7 @@ source "board/intel/Kconfig" source "arch/x86/cpu/baytrail/Kconfig" source "arch/x86/cpu/coreboot/Kconfig" source "arch/x86/cpu/ivybridge/Kconfig" +source "arch/x86/cpu/qemu/Kconfig" source "arch/x86/cpu/quark/Kconfig" source "arch/x86/cpu/queensbay/Kconfig"
arch/x86/cpu/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-y += interrupts.o cpu.o call64.o obj-$(CONFIG_INTEL_BAYTRAIL) += baytrail/ obj-$(CONFIG_SYS_COREBOOT) += coreboot/ +obj-$(CONFIG_QEMU) += qemu/ obj-$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE) += ivybridge/ obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/ obj-$(CONFIG_INTEL_QUARK) += quark/
arch/x86/cpu/qemu/Kconfig new file +21 -0
@@ -0,0 +1,21 @@ +# +# Copyright (C) 2015, Bin Meng <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +config QEMU + bool + select TSC_CALIBRATION_BYPASS + +if QEMU + +config SYS_CAR_ADDR + hex + default 0xd0000 + +config SYS_CAR_SIZE + hex + default 0x10000 + +endif
arch/x86/cpu/qemu/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# +# Copyright (C) 2015, Bin Meng <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += car.o dram.o qemu.o +obj-$(CONFIG_PCI) += pci.o
arch/x86/cpu/qemu/car.S new file +26 -0
@@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015, Bin Meng <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <config.h> +#include <asm/post.h> + +.globl car_init +car_init: + /* Save the BIST result */ + movl %eax, %ebp + + post_code(POST_CAR_START) + + /* + * Since we know we are running inside emulator, + * we can do nothing here for CAR initialization. + */ + + /* Restore the BIST result */ + movl %ebp, %eax + + post_code(POST_CAR_CPU_CACHE) + jmp car_init_ret
arch/x86/cpu/qemu/dram.c new file +46 -0
46 lines not on this page · raw message
arch/x86/cpu/qemu/pci.c new file +49 -0
49 lines not on this page · raw message
arch/x86/cpu/qemu/qemu.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright (C) 2015, Bin Meng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <asm/post.h> +#include <asm/processor.h> + +int arch_cpu_init (void ) +{ +int ret; + +post_code (POST_CPU_INIT ); +#ifdef CONFIG_SYS_X86_TSC_TIMER +timer_set_base (rdtsc ()); +#endif + + ret =x86_cpu_init_f (); +if (ret) +return ret; + +return 0 ; +} + +int print_cpuinfo (void ) +{ +post_code (POST_CPU_INFO ); +return default_print_cpuinfo (); +} + +void reset_cpu (ulong addr) +{ +/* cold reset */ +x86_full_reset (); +}
arch/x86/dts/Makefile +2 -1
@@ -2,7 +2,8 @@ dtb-y += chromebook_link.dtb \ chromebox_panther.dtb \ crownbay.dtb \ galileo.dtb \ - minnowmax.dtb + minnowmax.dtb \ + qemu-x86.dtb targets += $(dtb-y)
arch/x86/dts/qemu-x86.dts new file +34 -0
@@ -0,0 +1,34 @@ +/* + * Copyright (C) 2015, Bin Meng <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; + +/include/ "skeleton.dtsi" +/include/ "serial.dtsi" + +/ { + model = "QEMU x86"; + compatible = "qemu,x86"; + + config { + silent_console = <0>; + }; + + chosen { + stdout-path = "/serial"; + }; + + pci { + compatible = "pci-x86"; + #address-cells = <3>; + #size-cells = <2>; + u-boot,dm-pre-reloc; + ranges = <0x02000000 0x0 0xc0000000 0xc0000000 0 0x10000000 + 0x42000000 0x0 0xd0000000 0xd0000000 0 0x10000000 + 0x01000000 0x0 0x2000 0x2000 0 0xe000>; + }; + +};
arch/x86/include/asm/arch-qemu/gpio.h new file +13 -0
@@ -0,0 +1,13 @@ +/* +* Copyright (C) 2015, Bin Meng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _X86_ARCH_GPIO_H_ +#define _X86_ARCH_GPIO_H_ + +/* Where in config space is the register that points to the GPIO registers? */ +#define PCI_CFG_GPIOBASE 0x44 + +#endif /* _X86_ARCH_GPIO_H_ */
arch/x86/include/asm/arch-qemu/qemu.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* Copyright (C) 2015, Bin Meng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _ARCH_QEMU_H_ +#define _ARCH_QEMU_H_ + +/* I/O Ports */ +#define CMOS_ADDR_PORT 0x70 +#define CMOS_DATA_PORT 0x71 + +#define LOW_RAM_ADDR 0x34 +#define HIGH_RAM_ADDR 0x35 + +#endif /* _ARCH_QEMU_H_ */
board/emulation/Kconfig new file +25 -0
@@ -0,0 +1,25 @@ +# +# Copyright (C) 2015, Bin Meng <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +if VENDOR_EMULATION + +choice + prompt "Mainboard model" + +config TARGET_QEMU_X86 + bool "QEMU x86" + help + This is the QEMU emulated x86 board. U-Boot supports running + as a coreboot payload as well as bare boot without coreboot. + There are two types of x86 boards supported by QEMU which are + supported by U-Boot. They are via QEMU '-M pc', an i440FX/PIIX + chipset platform and '-M q35', a Q35/ICH9 chipset platform. + +endchoice + +source "board/emulation/qemu-x86/Kconfig" + +endif
board/emulation/qemu-x86/Kconfig new file +24 -0
@@ -0,0 +1,24 @@ +if TARGET_QEMU_X86 + +config SYS_BOARD + default "qemu-x86" + +config SYS_VENDOR + default "emulation" + +config SYS_SOC + default "qemu" + +config SYS_CONFIG_NAME + default "qemu-x86" + +config SYS_TEXT_BASE + default 0xfff00000 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select X86_RESET_VECTOR + select QEMU + select BOARD_ROMSIZE_KB_1024 + +endif
board/emulation/qemu-x86/MAINTAINERS new file +6 -0
@@ -0,0 +1,6 @@ +QEMU X86 BOARD +M: Bin Meng <[email protected]> +S: Maintained +F: board/emulation/qemu-x86/ +F: include/configs/qemu-x86.h +F: configs/qemu-x86_defconfig
board/emulation/qemu-x86/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# +# Copyright (C) 2015, Bin Meng <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += qemu-x86.o start.o
board/emulation/qemu-x86/qemu-x86.c new file +13 -0
@@ -0,0 +1,13 @@ +/* +* Copyright (C) 2015, Bin Meng <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <netdev.h> + +int board_eth_init (bd_t *bis) +{ +return pci_eth_init (bis); +}
board/emulation/qemu-x86/start.S new file +9 -0
@@ -0,0 +1,9 @@ +/* + * Copyright (C) 2015, Bin Meng <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +.globl early_board_init +early_board_init: + jmp early_board_init_ret
configs/qemu-x86_defconfig new file +6 -0
@@ -0,0 +1,6 @@ +CONFIG_X86=y +CONFIG_VENDOR_EMULATION=y +CONFIG_TARGET_QEMU_X86=y +CONFIG_OF_CONTROL=y +CONFIG_OF_SEPARATE=y +CONFIG_DEFAULT_DEVICE_TREE="qemu-x86"
include/configs/qemu-x86.h new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
1.8.2.1
PATCH v2 2/6 x86: Support QEMU x86 targets
Quoted 40 lines · Bin Meng
This commit introduces the initial U-Boot support for QEMU x86 targets. U-Boot can boot from coreboot as a payload, or directly without coreboot.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
Changes in v2: None
arch/x86/Kconfig | 5 +++ arch/x86/cpu/Makefile | 1 + arch/x86/cpu/qemu/Kconfig | 21 +++++++++++++ arch/x86/cpu/qemu/Makefile | 8 +++++ arch/x86/cpu/qemu/car.S | 26 ++++++++++++++++ arch/x86/cpu/qemu/dram.c | 46 ++++++++++++++++++++++++++++ arch/x86/cpu/qemu/pci.c | 49 ++++++++++++++++++++++++++++++ arch/x86/cpu/qemu/qemu.c | 37 +++++++++++++++++++++++ arch/x86/dts/Makefile | 3 +- arch/x86/dts/qemu-x86.dts | 34 +++++++++++++++++++++ arch/x86/include/asm/arch-qemu/gpio.h | 13 ++++++++ arch/x86/include/asm/arch-qemu/qemu.h | 17 +++++++++++ board/emulation/Kconfig | 25 +++++++++++++++ board/emulation/qemu-x86/Kconfig | 24 +++++++++++++++ board/emulation/qemu-x86/MAINTAINERS | 6 ++++ board/emulation/qemu-x86/Makefile | 7 +++++ board/emulation/qemu-x86/qemu-x86.c | 13 ++++++++ board/emulation/qemu-x86/start.S | 9 ++++++ configs/qemu-x86_defconfig | 6 ++++ include/configs/qemu-x86.h | 57 +++++++++++++++++++++++++++++++++++ 20 files changed, 406 insertions(+), 1 deletion(-) create mode 100644 arch/x86/cpu/qemu/Kconfig create mode 100644 arch/x86/cpu/qemu/Makefile create mode 100644 arch/x86/cpu/qemu/car.S create mode 100644 arch/x86/cpu/qemu/dram.c create mode 100644 arch/x86/cpu/qemu/pci.c create mode 100644 arch/x86/cpu/qemu/qemu.c create mode 100644 arch/x86/dts/qemu-x86.dts create mode 100644 arch/x86/include/asm/arch-qemu/gpio.h create mode 100644 arch/x86/include/asm/arch-qemu/qemu.h
Quoted 8 lines
create mode 100644 board/emulation/Kconfig create mode 100644 board/emulation/qemu-x86/Kconfig create mode 100644 board/emulation/qemu-x86/MAINTAINERS create mode 100644 board/emulation/qemu-x86/Makefile create mode 100644 board/emulation/qemu-x86/qemu-x86.c create mode 100644 board/emulation/qemu-x86/start.S create mode 100644 configs/qemu-x86_defconfig create mode 100644 include/configs/qemu-x86.h
Applied to u-boot-x86, thanks!
PATCH v2 3/6 x86: Make QEMU the default vendor
In reply to a message not in the archiveNow that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
---
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +1 -1
@@ -12,7 +12,7 @@ config SYS_VSNPRINTF choice prompt "Mainboard vendor" - default VENDOR_COREBOOT + default VENDOR_EMULATION config VENDOR_COREBOOT bool "coreboot"
Signature · 1 line
1.8.2.1
PATCH v2 3/6 x86: Make QEMU the default vendor
Quoted 6 lines · Bin Meng
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>
Quoted 6 lines
---
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to u-boot-x86, thanks!
PATCH v2 3/6 x86: Make QEMU the default vendor
Hi Bin,
Quoted 9 lines · Simon Glass
Quoted 8 lines · Bin Meng
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
Quoted 6 lines
Quoted 4 lines
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor
x86: + coreboot-x86
+
+Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2
+make: *** [sub-make] Error 2
Regards,
Simon
PATCH v2 3/6 x86: Make QEMU the default vendor
Hi Simon,
Quoted 24 lines · Simon Glass
Hi Bin,
Quoted 9 lines · Simon Glass
Quoted 8 lines · Bin Meng
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
Quoted 6 lines
Quoted 4 lines
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
04: x86: Make QEMU the default vendor
x86: + coreboot-x86
Review
Quoted 7 lines
(quoted diff) +7
-0+ +Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2
That's weird. I didn't see such error when building the patchset with buildman.
Regards,
Bin
PATCH v2 3/6 x86: Make QEMU the default vendor
Hi Simon,
Quoted 24 lines · Bin Meng
Hi Simon,
Quoted 21 lines · Simon Glass
Hi Bin,
Quoted 9 lines · Simon Glass
Quoted 8 lines · Bin Meng
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
Quoted 6 lines
Quoted 4 lines
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
Quoted 13 lines
Review
Quoted 10 lines
04: x86: Make QEMU the default vendor
x86: + coreboot-x86(quoted diff) +7
-0+ +Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2That's weird. I didn't see such error when building the patchset with buildman.
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed 'CONFIG_VENDOR_COREBOOT=y'?
Regards,
Bin
PATCH v2 3/6 x86: Make QEMU the default vendor
Hi Bin,
Quoted 41 lines · Bin Meng
Hi Simon,
Quoted 24 lines · Bin Meng
Hi Simon,
Quoted 21 lines · Simon Glass
Hi Bin,
Quoted 9 lines · Simon Glass
Quoted 8 lines · Bin Meng
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
Quoted 6 lines
Quoted 4 lines
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
Quoted 13 lines
Review
Quoted 10 lines
04: x86: Make QEMU the default vendor
x86: + coreboot-x86(quoted diff) +7
-0+ +Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2That's weird. I didn't see such error when building the patchset with buildman.
Quoted 7 lines
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed '
CONFIG_VENDOR_COREBOOT=y'?
It could perhaps be a merge conflict. If it's needed I can put it back in.
Regards,
Simon
PATCH v2 3/6 x86: Make QEMU the default vendor
Hi Simon,
Quoted 47 lines · Simon Glass
Hi Bin,
Quoted 44 lines · Bin Meng
Hi Simon,
Quoted 24 lines · Bin Meng
Hi Simon,
Quoted 21 lines · Simon Glass
Hi Bin,
Quoted 9 lines · Simon Glass
Quoted 8 lines · Bin Meng
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
Quoted 6 lines
Quoted 4 lines
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
Quoted 13 lines
Review
Quoted 10 lines
04: x86: Make QEMU the default vendor
x86: + coreboot-x86(quoted diff) +7
-0+ +Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2That's weird. I didn't see such error when building the patchset with buildman.
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
Quoted 7 lines
Quoted 4 lines
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed '
CONFIG_VENDOR_COREBOOT=y'?It could perhaps be a merge conflict. If it's needed I can put it back in.
No, it looks Joe's commit is already there in the U-Boot main git repo. I've just worked out a patch to revert the change and sent it to the mailing list.
Regards,
Bin
PATCH v2 3/6 x86: Make QEMU the default vendor
Hi Bin,
Quoted 55 lines · Bin Meng
Hi Simon,
Quoted 52 lines · Simon Glass
Hi Bin,
Quoted 48 lines · Bin Meng
Hi Simon,
Quoted 24 lines · Bin Meng
Hi Simon,
Quoted 21 lines · Simon Glass
Hi Bin,
Quoted 9 lines · Simon Glass
Quoted 8 lines · Bin Meng
Now that we have QEMU support, make it the default vendor in the 'make menuconfig' screen.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>---
Quoted 6 lines
Quoted 4 lines
Changes in v2: None
arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Applied to u-boot-x86, thanks!
For some reason I am seeing a failure here:
Quoted 13 lines
Review
Quoted 10 lines
04: x86: Make QEMU the default vendor
x86: + coreboot-x86(quoted diff) +7
-0+ +Device Tree Source is not correctly specified. +Please define 'CONFIG_DEFAULT_DEVICE_TREE' +or build with 'DEVICE_TREE=<device_tree>' argument +make[2]: *** [arch/x86/dts/unset.dtb] Error 1 +make[1]: *** [dts/dt.dtb] Error 2 +make: *** [sub-make] Error 2That's weird. I didn't see such error when building the patchset with buildman.
I've figured out the root cause. For some reason which I don't understand, commit bd328eb broke this.
+Joe,
Do you know if there is something wrong with commit bd328eb that accidentally removed '
CONFIG_VENDOR_COREBOOT=y'?
Quoted 6 lines
Quoted 2 lines
It could perhaps be a merge conflict. If it's needed I can put it back in.
No, it looks Joe's commit is already there in the U-Boot main git repo. I've just worked out a patch to revert the change and sent it to the mailing list.
That patch was simply a call to make *_defconfig && make savedefconfig.
The way this usually happens is that the Kconfig file is changed to make the config (for instance CONFIG_VENDOR_COREBOOT) no longer the default, without adding that to the defconfig files.
Cheers,
-Joe
PATCH v2 4/6 x86: Set CONFIG_NR_DRAM_BANKS to 8 and move it to x86-common.h
In reply to a message not in the archiveSome x86 boards set CONFIG_NR_DRAM_BANKS to 1, which causes incorrect DRAM size printed when booting from coreboot, like this:
CPU: x86, vendor Intel, device 663h
DRAM: 636 KiB
Using default environment
Change it to 8 which should be enough for both coreboot and bare cases, and move it to x86-common.h.
---
Changes in v2:
- New patch to set CONFIG_NR_DRAM_BANKS to 8 and move it to x86-common.h
include/configs/crownbay.h | 2 -- include/configs/galileo.h | 2 -- include/configs/minnowmax.h | 2 -- include/configs/qemu-x86.h | 2 -- include/configs/x86-chromebook.h | 1 - include/configs/x86-common.h | 1 + 6 files changed, 1 insertion(+), 9 deletions(-)
include/configs/crownbay.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_ARCH_MISC_INIT -#define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_X86_SERIAL #define CONFIG_SMSC_LPC47M
include/configs/galileo.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_SYS_MONITOR_LEN (1 << 20)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_X86_SERIAL /* ns16550 UART is memory-mapped in Quark SoC */
include/configs/minnowmax.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_SYS_MONITOR_LEN (1 << 20)#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_X86_SERIAL #define CONFIG_SMSC_LPC47M
include/configs/qemu-x86.h +0 -2
@@ -15,8 +15,6 @@#define CONFIG_SYS_MONITOR_LEN (1 << 20) -#define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_X86_SERIAL #define CONFIG_PCI_MEM_BUS 0xc0000000
include/configs/x86-chromebook.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R -#define CONFIG_NR_DRAM_BANKS 8#define CONFIG_X86_MRC_ADDR 0xfffa0000#define CONFIG_CACHE_MRC_SIZE_KB 512
include/configs/x86-common.h +1 -0
@@ -21,6 +21,7 @@#define CONFIG_DISPLAY_BOARDINFO_LATE #define CONFIG_DISPLAY_CPUINFO #define CONFIG_LAST_STAGE_INIT +#define CONFIG_NR_DRAM_BANKS 8#define CONFIG_LMB #define CONFIG_OF_LIBFDT
Signature · 1 line
1.8.2.1
PATCH v2 4/6 x86: Set CONFIG_NR_DRAM_BANKS to 8 and move it to x86-common.h
Quoted 17 lines · Bin Meng
Some x86 boards set
CONFIG_NR_DRAM_BANKSto 1, which causes incorrect DRAM size printed when booting from coreboot, like this:CPU: x86, vendor Intel, device 663h
DRAM: 636 KiB
Using default environmentChange it to 8 which should be enough for both coreboot and bare cases, and move it to
x86-common.h.Signed-off-by Bin Meng <[email protected]>---
Changes in v2:
- New patch to setCONFIG_NR_DRAM_BANKSto 8 and move it tox86-common.h
Quoted 7 lines
include/configs/crownbay.h | 2 -- include/configs/galileo.h | 2 -- include/configs/minnowmax.h | 2 -- include/configs/qemu-x86.h | 2 -- include/configs/x86-chromebook.h | 1 - include/configs/x86-common.h | 1 + 6 files changed, 1 insertion(+), 9 deletions(-)
PATCH v2 4/6 x86: Set CONFIG_NR_DRAM_BANKS to 8 and move it to x86-common.h
Quoted 26 lines · Simon Glass
Quoted 17 lines · Bin Meng
Some x86 boards set
CONFIG_NR_DRAM_BANKSto 1, which causes incorrect DRAM size printed when booting from coreboot, like this:CPU: x86, vendor Intel, device 663h
DRAM: 636 KiB
Using default environmentChange it to 8 which should be enough for both coreboot and bare cases, and move it to
x86-common.h.Signed-off-by Bin Meng <[email protected]>---
Changes in v2:
- New patch to setCONFIG_NR_DRAM_BANKSto 8 and move it tox86-common.hQuoted 7 lines
include/configs/crownbay.h | 2 -- include/configs/galileo.h | 2 -- include/configs/minnowmax.h | 2 -- include/configs/qemu-x86.h | 2 -- include/configs/x86-chromebook.h | 1 - include/configs/x86-common.h | 1 + 6 files changed, 1 insertion(+), 9 deletions(-)
Quoted 1 line
Acked-by Simon Glass <[email protected]>
Applied to u-boot-x86, thanks!
PATCH v2 5/6 x86: Change coreboot default build configuration to QEMU
In reply to a message not in the archiveQEMU is much easier for us test booting U-Boot as a coreboot payload than having a real board like chromebook_link.
---
Changes in v2: None
board/coreboot/coreboot/Kconfig | 6 +++--- configs/coreboot-x86_defconfig | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
board/coreboot/coreboot/Kconfig +3 -3
@@ -16,21 +16,21 @@ comment "coreboot-specific options" config SYS_CONFIG_NAME string "Board configuration file" - default "chromebook_link" + default "qemu-x86" help This option selects the board configuration file in include/configs/ directory to be used to build U-Boot for coreboot. config DEFAULT_DEVICE_TREE string "Board Device Tree Source (dts) file" - default "chromebook_link" + default "qemu-x86" help This option selects the board Device Tree Source (dts) file in arch/x86/dts/ directory to be used to build U-Boot for coreboot. config SYS_CAR_ADDR hex "Board specific Cache-As-RAM (CAR) address" - default 0x19200000 + default 0x01920000 help This option specifies the board specific Cache-As-RAM (CAR) address.
configs/coreboot-x86_defconfig +1 -0
@@ -3,3 +3,4 @@ CONFIG_VENDOR_COREBOOT=y CONFIG_TARGET_COREBOOT=y CONFIG_OF_CONTROL=y CONFIG_DM_PCI=y +CONFIG_TSC_CALIBRATION_BYPASS=y
Signature · 1 line
1.8.2.1
PATCH v2 5/6 x86: Change coreboot default build configuration to QEMU
Quoted 6 lines · Bin Meng
QEMU is much easier for us test booting U-Boot as a coreboot payload than having a real board like
chromebook_link.Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>
Quoted 7 lines
---
Changes in v2: None
board/coreboot/coreboot/Kconfig | 6 +++--- configs/coreboot-x86_defconfig | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
Applied to u-boot-x86, thanks!
PATCH v2 6/6 x86: Update README.x86 for QEMU support
In reply to a message not in the archiveDocument how to build and test U-Boot with QEMU.
---
Changes in v2: None
doc/README.x86 | 65 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 17 deletions(-)
doc/README.x86 +48 -17
@@ -14,12 +14,13 @@ including supported boards, build instructions, todo list, etc. Status ------ U-Boot supports running as a coreboot [1] payload on x86. So far only Link -(Chromebook Pixel) has been tested, but it should work with minimal adjustments -on other x86 boards since coreboot deals with most of the low-level details. +(Chromebook Pixel) and QEMU [2] x86 targets have been tested, but it should +work with minimal adjustments on other x86 boards since coreboot deals with +most of the low-level details. U-Boot also supports booting directly from x86 reset vector without coreboot, -aka raw support or bare support. Currently Link, Intel Crown Bay, Intel -Minnowboard Max and Intel Galileo support running U-Boot 'bare metal'. +aka raw support or bare support. Currently Link, QEMU x86 targets and all +Intel boards support running U-Boot 'bare metal'. As for loading an OS, U-Boot supports directly booting a 32-bit or 64-bit Linux kernel as part of a FIT image. It also supports a compressed zImage.
@@ -32,15 +33,15 @@ on other architectures, like below: $ make coreboot-x86_defconfig $ make all -Note this default configuration will build a U-Boot payload for the Link board. +Note this default configuration will build a U-Boot payload for the QEMU board. To build a coreboot payload against another board, you can change the build configuration during the 'make menuconfig' process. x86 architecture ---> ... - (chromebook_link) Board configuration file - (chromebook_link) Board Device Tree Source (dts) file - (0x19200000) Board specific Cache-As-RAM (CAR) address + (qemu-x86) Board configuration file + (qemu-x86) Board Device Tree Source (dts) file + (0x01920000) Board specific Cache-As-RAM (CAR) address (0x4000) Board specific Cache-As-RAM (CAR) size Change the 'Board configuration file' and 'Board Device Tree Source (dts) file'
@@ -78,7 +79,7 @@ Find the following files: * ./northbridge/intel/sandybridge/systemagent-r6.bin The 3rd one should be renamed to mrc.bin. -As for the video ROM, you can get it here [2]. +As for the video ROM, you can get it here [3]. Make sure all these binary blobs are put in the board directory. Now you can build U-Boot and obtain u-boot.rom:
@@ -88,8 +89,8 @@ $ make all Intel Crown Bay specific instructions: -U-Boot support of Intel Crown Bay board [3] relies on a binary blob called -Firmware Support Package [4] to perform all the necessary initialization steps +U-Boot support of Intel Crown Bay board [4] relies on a binary blob called +Firmware Support Package [5] to perform all the necessary initialization steps as documented in the BIOS Writer Guide, including initialization of the CPU, memory controller, chipset and certain bus interfaces.
@@ -178,6 +179,13 @@ Now you can build U-Boot and obtain u-boot.rom $ make galileo_defconfig $ make all +QEMU x86 target instructions: + +To build u-boot.rom for QEMU x86 targets, just simply run + +$ make qemu-x86_defconfig +$ make all + Test with coreboot ------------------ For testing U-Boot as the coreboot payload, there are things that need be paid
@@ -207,10 +215,33 @@ At present it seems that for Minnowboard Max, coreboot does not pass through the video information correctly (it always says the resolution is 0x0). This works correctly for link though. +Test with QEMU +-------------- +QEMU is a fancy emulator that can enable us to test U-Boot without access to +a real x86 board. To launch QEMU with u-boot.rom, call QEMU as follows: + +$ qemu-system-i386 -nographic -bios path/to/u-boot.rom + +This will instantiate an emulated x86 board with i440FX and PIIX chipset. QEMU +also supports emulating an x86 board with Q35 and ICH9 based chipset, which is +also supported by U-Boot. To instantiate such a machine, call QEMU with: + +$ qemu-system-i386 -nographic -bios path/to/u-boot.rom -M q35 + +Note by default QEMU instantiated boards only have 128 MiB system memory. But +it is enough to have U-Boot boot and function correctly. You can increase the +system memory by pass '-m' parameter to QEMU if you want more memory: + +$ qemu-system-i386 -nographic -bios path/to/u-boot.rom -m 1024 + +This creates a board with 1 GiB system memory. Currently U-Boot for QEMU only +supports 3 GiB maximum system memory and reserves the last 1 GiB address space +for PCI device memory-mapped I/O and other stuff, so the maximum value of '-m' +would be 3072. CPU Microcode ------------- -Modern CPUs usually require a special bit stream called microcode [5] to be +Modern CPUs usually require a special bit stream called microcode [6] to be loaded on the processor after power up in order to function properly. U-Boot has already integrated these as hex dumps in the source tree.
@@ -227,7 +258,6 @@ arch/x86/dts/ for these device tree source files. Useful Commands --------------- - In keeping with the U-Boot philosophy of providing functions to check and adjust internal settings, there are several x86-specific commands that may be useful:
@@ -314,7 +344,8 @@ TODO List References ---------- [1] http://www.coreboot.org -[2] http://www.coreboot.org/~stepan/pci8086,0166.rom -[3] http://www.intel.com/content/www/us/en/embedded/design-tools/evaluation-platforms/atom-e660-eg20t-development-kit.html -[4] http://www.intel.com/fsp -[5] http://en.wikipedia.org/wiki/Microcode +[2] http://www.qemu.org +[3] http://www.coreboot.org/~stepan/pci8086,0166.rom +[4] http://www.intel.com/content/www/us/en/embedded/design-tools/evaluation-platforms/atom-e660-eg20t-development-kit.html +[5] http://www.intel.com/fsp +[6] http://en.wikipedia.org/wiki/Microcode
Signature · 1 line
1.8.2.1
PATCH v2 6/6 x86: Update README.x86 for QEMU support
Quoted 11 lines · Bin Meng
Document how to build and test U-Boot with QEMU.
Signed-off-by Bin Meng <[email protected]>Acked-by Simon Glass <[email protected]>---
Changes in v2: None
doc/README.x86 | 65 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 17 deletions(-)
Applied to u-boot-x86, thanks!