On Thu, 2024-09-12 at 11:18 +0200, Enrico Jörns via lists.openembedded.org wrote: > From: Enrico Jorns <e...@pengutronix.de> > > These are set in the barebox recipe 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. > > Signed-off-by: Enrico Jorns <e...@pengutronix.de> > --- > meta/conf/machine/qemuarm.conf | 1 + > meta/conf/machine/qemuarm64.conf | 1 + > meta/conf/machine/qemux86-64.conf | 1 + > 3 files changed, 3 insertions(+)
This patch needs the commit message updating as it no longer matches the changes below! Things did pass in automated testing so I think we're close with this. Cheers, Richard > 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 > > KERNEL_IMAGETYPE = "zImage" > > +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" > UBOOT_MACHINE ?= "qemu_arm_defconfig" > > SERIAL_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 > > KERNEL_IMAGETYPE = "Image" > > +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" > UBOOT_MACHINE ?= "qemu_arm64_defconfig" > > SERIAL_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" > require conf/machine/include/x86/tune-x86-64-v3.inc > require conf/machine/include/x86/qemuboot-x86.inc > > +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" > UBOOT_MACHINE ?= "qemu-x86_64_defconfig" > > KERNEL_IMAGETYPE = "bzImage" > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#205670): https://lists.openembedded.org/g/openembedded-core/message/205670 Mute This Topic: https://lists.openembedded.org/mt/108410146/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
