leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: qemu: Create separate i440fx and q35 device trees

Browse Source 
Although the two qemu-x86 targets (i440fx and q35) share a lot in
common, they still have something that cannot easily handled in one
single device tree). Split to create two dedicated device tree files
and make the i440fx be the default build target.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2015-06-03 09:20:04 +08:00 committed by Simon Glass
parent 65cdd9be3e
commit 683b09d783
6 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/dts/Makefile
View File

@ -3,7 +3,8 @@ dtb-y += chromebook_link.dtb \
crownbay.dtb \
galileo.dtb \
minnowmax.dtb \
qemu-x86.dtb
qemu-x86_i440fx.dtb \
qemu-x86_q35.dtb
targets += $(dtb-y)

34
arch/x86/dts/qemu-x86_i440fx.dts Normal file
View File

@ -0,0 +1,34 @@
/*
* Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
/dts-v1/;
/include/ "skeleton.dtsi"
/include/ "serial.dtsi"
/ {
model = "QEMU x86 (I440FX)";
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>;
};
};

2
arch/x86/dts/qemu-x86.dts → arch/x86/dts/qemu-x86_q35.dts
View File

@ -10,7 +10,7 @@
/include/ "serial.dtsi"
/ {
model = "QEMU x86";
model = "QEMU x86 (Q35)";
compatible = "qemu,x86";
config {

2
board/coreboot/coreboot/Kconfig
View File

@ -23,7 +23,7 @@ config SYS_CONFIG_NAME
config DEFAULT_DEVICE_TREE
string "Board Device Tree Source (dts) file"
default "qemu-x86"
default "qemu-x86_i440fx"
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.

3
configs/qemu-x86_defconfig
View File

@ -1,10 +1,9 @@
CONFIG_X86=y
CONFIG_VENDOR_EMULATION=y
CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
CONFIG_TARGET_QEMU_X86=y
CONFIG_CMD_NET=y
CONFIG_OF_CONTROL=y
CONFIG_OF_SEPARATE=y
CONFIG_DEFAULT_DEVICE_TREE="qemu-x86"
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y

10
doc/README.x86
View File

@ -40,7 +40,7 @@ configuration during the 'make menuconfig' process.
x86 architecture --->
...
(qemu-x86) Board configuration file
(qemu-x86) Board Device Tree Source (dts) file
(qemu-x86_i440fx) Board Device Tree Source (dts) file
(0x01920000) Board specific Cache-As-RAM (CAR) address
(0x4000) Board specific Cache-As-RAM (CAR) size
@ -186,6 +186,14 @@ To build u-boot.rom for QEMU x86 targets, just simply run
$ make qemu-x86_defconfig
$ make all
Note this default configuration will build a U-Boot for the QEMU x86 i440FX
board. To build a U-Boot against QEMU x86 Q35 board, you can change the build
configuration during the 'make menuconfig' process like below:
Device Tree Control --->
...
(qemu-x86_q35) Default Device Tree for DT control
Test with coreboot
------------------
For testing U-Boot as the coreboot payload, there are things that need be paid