summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2024-10-11 14:01:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-10-11 15:57:44 +0100
commit776c12c5c860bd0be4e2399724b7fbe04107a838 (patch)
tree7e1123af7843609facbee8a3c6ad3ef30ca69f58 /meta/conf
parenta9531159c55f018984c58ed0cea1da0e9263b2d2 (diff)
downloadpoky-776c12c5c860bd0be4e2399724b7fbe04107a838.tar.gz
barebox: set default BAREBOX_CONFIG for qemu machines
These are set in the barebox class rather in the corresponding machines (where they would belong otherwise) to keep the impact of barebox to oe-core minimal for now. "multi_v7_defconfig" is used for qemuarm since this is the default barebox armv7 config that just enables all supported platforms. "multi_v8_defconfig" is used for qemuarm64 sine this is the default barebox armv8 config that just enables all supported platforms. "efi_defconfig" is used for qemux86-64 which is the primary platform where barebox will not be the first stage bootloader but an EFI payload. Since these changes make barebox a provider for virtual/bootloader, explicitly default to u-boot in the corresponding MACHINE configs to not unnecessarily surprise users. (From OE-Core rev: 93da14f8f85202bad3dec9d979d01f4e8f9708d6) Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/qemuarm.conf1
-rw-r--r--meta/conf/machine/qemuarm64.conf1
-rw-r--r--meta/conf/machine/qemux86-64.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 943ce7c16a..af76a53b8e 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -7,6 +7,7 @@ require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "zImage" 8KERNEL_IMAGETYPE = "zImage"
9 9
10PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
10UBOOT_MACHINE ?= "qemu_arm_defconfig" 11UBOOT_MACHINE ?= "qemu_arm_defconfig"
11 12
12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" 13SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf
index a096d964db..d310445a34 100644
--- a/meta/conf/machine/qemuarm64.conf
+++ b/meta/conf/machine/qemuarm64.conf
@@ -7,6 +7,7 @@ require conf/machine/include/qemu.inc
7 7
8KERNEL_IMAGETYPE = "Image" 8KERNEL_IMAGETYPE = "Image"
9 9
10PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
10UBOOT_MACHINE ?= "qemu_arm64_defconfig" 11UBOOT_MACHINE ?= "qemu_arm64_defconfig"
11 12
12SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" 13SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 14873a3b4f..4a9c6d364b 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -13,6 +13,7 @@ DEFAULTTUNE ?= "core2-64"
13require conf/machine/include/x86/tune-x86-64-v3.inc 13require conf/machine/include/x86/tune-x86-64-v3.inc
14require conf/machine/include/x86/qemuboot-x86.inc 14require conf/machine/include/x86/qemuboot-x86.inc
15 15
16PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
16UBOOT_MACHINE ?= "qemu-x86_64_defconfig" 17UBOOT_MACHINE ?= "qemu-x86_64_defconfig"
17 18
18KERNEL_IMAGETYPE = "bzImage" 19KERNEL_IMAGETYPE = "bzImage"