summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2018-07-11 17:03:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 10:18:42 +0100
commit48d10a0a91a3f6fa160da3230172fb1a64329d3c (patch)
treed83fa8d835aafc2d2ba8c2e030fd4f51cab98a2c /meta/conf
parent9911015b348fa722a532b2ade493f8b553f49177 (diff)
downloadpoky-48d10a0a91a3f6fa160da3230172fb1a64329d3c.tar.gz
qemux86*: Add U-Boot machine configuration
Add U-Boot machine configuration for the qemux86 and qemux86-64 to allow building U-Boot on those targets. This in turn allows the auto-updater to update the U-Boot recipe. (From OE-Core rev: c9bd7f71b59e1c8e7436d65cd8ad6bfb29051c93) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 2330c7d86e..fd1f4142e9 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -12,6 +12,8 @@ DEFAULTTUNE ?= "core2-64"
12require conf/machine/include/tune-core2.inc 12require conf/machine/include/tune-core2.inc
13require conf/machine/include/qemuboot-x86.inc 13require conf/machine/include/qemuboot-x86.inc
14 14
15UBOOT_MACHINE ?= "qemu-x86_64_defconfig"
16
15KERNEL_IMAGETYPE = "bzImage" 17KERNEL_IMAGETYPE = "bzImage"
16 18
17SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" 19SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 811e3ef7cf..efcebb2782 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -11,6 +11,8 @@ require conf/machine/include/qemu.inc
11require conf/machine/include/tune-i586.inc 11require conf/machine/include/tune-i586.inc
12require conf/machine/include/qemuboot-x86.inc 12require conf/machine/include/qemuboot-x86.inc
13 13
14UBOOT_MACHINE ?= "qemu-x86_defconfig"
15
14KERNEL_IMAGETYPE = "bzImage" 16KERNEL_IMAGETYPE = "bzImage"
15 17
16SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" 18SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"