[PATCH 1/3] baremetal-helloworld: Enable x86 and x86-64 ports

[PATCH 1/3] baremetal-helloworld: Enable x86 and x86-64 ports

[Alejandro Enedino Hernandez Samaniego]

- The qemux86 port for helloworld-baremetal builds in the standard way, however,
  it uses NASM syntax for the startup code, hence we include a dependency to
  nasm-native, QEMU forces us to use an ELF file rather than a bin file to boot
  from this architecture using the -kernel parameter.

- QEMU refuses to boot using the -kernel parameter for files containing an ELF64
  header [1], instead, it requires a multiboot2 compatible image.

  We could create an image that contains a multiboot2 header by piggybacking
  into grub2-native, specifically grub-mkrescue, but it requires some extra
  runtime dependencies (xorriso which is currently part of meta-oe), and assumes
  a grub installation exists on the host.

  Due to host contamination and dependency complications, we dont rely on grub2,
  but rather do this process manually instead, the x86-64 port contains a stage1
  bootloader, stage2 bootloader and a 64 bit baremetal app (multiboot2
  compatible), booting into real (16 bit), protected (32 bit) and long (64 bit)
  modes, eventually running the helloworld-baremetal app. This is the reason why
  we need the code changes to use a separate Makefile, and create an image
  specifically for qemux86-64.

$ runqemu nographic
Booting from ROM..
Hello OpenEmbedded on x86!

$ runqemu nographic
Starting Stage 1 Bootloader
Loading Stage 2 Bootloader
Stage 2 Loaded.
Jumping to Stage2 Bootloader
In Stage 2
Done

Hello OpenEmbedded on x86-64!

[1] https://gitlab.com/qemu-project/qemu/-/blob/v7.2.0/hw/i386/multiboot.c#L199

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
---
 .../baremetal-helloworld_git.bb               | 22 +++++++++++++++++--
 meta/classes-recipe/baremetal-image.bbclass   |  5 +++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
index d11e2e530e..fede17b0f0 100644
--- a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
+++ b/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "These are introductory examples to showcase the use of QEMU to ru
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=39346640a23c701e4f459e05f56f4449"
 
-SRCREV = "31b4e5a337018b4a00a7426b0e5ed83b81df30c7"
+SRCREV = "22016ecbb9fb6c5f3a7a06698aea7ff8a701c166"
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master"
@@ -23,12 +23,15 @@ IMAGE_NAME_SUFFIX ?= ""
 inherit baremetal-image
 
 
+# startup code for x86 uses NASM syntax
+DEPENDS:qemux86:append = " nasm-native"
+
 # These parameters are app specific for this example
 # This will be translated automatically to the architecture and
 # machine that QEMU uses on OE, e.g. -machine virt -cpu cortex-a57
 # but the examples can also be run on other architectures/machines
 # such as vexpress-a15 by overriding the setting on the machine.conf
-COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64|qemuriscv32"
+COMPATIBLE_MACHINE = "qemuarmv5|qemuarm|qemuarm64|qemuriscv64|qemuriscv32|qemux86|qemux86-64"
 
 BAREMETAL_QEMUARCH ?= ""
 BAREMETAL_QEMUARCH:qemuarmv5 = "versatile"
@@ -36,9 +39,15 @@ BAREMETAL_QEMUARCH:qemuarm = "arm"
 BAREMETAL_QEMUARCH:qemuarm64 = "aarch64"
 BAREMETAL_QEMUARCH:qemuriscv64 = "riscv64"
 BAREMETAL_QEMUARCH:qemuriscv32 = "riscv32"
+BAREMETAL_QEMUARCH:qemux86 = "x86"
+BAREMETAL_QEMUARCH:qemux86-64 = "x86-64"
 
 EXTRA_OEMAKE:append = " QEMUARCH=${BAREMETAL_QEMUARCH} V=1"
 
+# qemux86-64 uses a different Makefile
+do_compile:prepend:qemux86-64(){
+    cd x86-64
+}
 
 # Install binaries on the proper location for baremetal-image to fetch and deploy
 do_install(){
@@ -51,3 +60,12 @@ FILES:${PN} += " \
     ${base_libdir}/firmware/${BAREMETAL_BINNAME}.bin \
     ${base_libdir}/firmware/${BAREMETAL_BINNAME}.elf \
 "
+
+# qemux86-64 boots from iso rather than -kernel, create image to boot from
+do_image:append:qemux86-64(){
+    dd if=/dev/zero of=${B}/build/img.iso bs=1M count=10 status=none
+    dd if=${B}/build/stage1.bin of=${B}/build/img.iso bs=512 count=1 conv=notrunc
+    dd if=${B}/build/stage2.bin of=${B}/build/img.iso bs=512 seek=1 count=64 conv=notrunc
+    dd if=${B}/build/hello_baremetal_x86-64.bin of=${B}/build/img.iso bs=512 seek=65 conv=notrunc
+    install ${B}/build/img.iso ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.iso
+}
diff --git a/meta/classes-recipe/baremetal-image.bbclass b/meta/classes-recipe/baremetal-image.bbclass
index 513155e9ae..70791f999a 100644
--- a/meta/classes-recipe/baremetal-image.bbclass
+++ b/meta/classes-recipe/baremetal-image.bbclass
@@ -86,6 +86,11 @@ QB_DEFAULT_FSTYPE ?= "bin"
 QB_DTB ?= ""
 QB_OPT_APPEND:append = " -nographic"
 
+# QEMU x86 requires an .elf kernel to boot rather than a .bin
+QB_DEFAULT_KERNEL:qemux86 ?= "${IMAGE_LINK_NAME}.elf"
+# QEMU x86-64 refuses to boot from -kernel, needs a multiboot compatible image
+QB_DEFAULT_FSTYPE:qemux86-64 ?= "iso"
+
 # RISC-V tunes set the BIOS, unset, and instruct QEMU to
 # ignore the BIOS and boot from -kernel
 QB_DEFAULT_BIOS:qemuriscv64 = ""
-- 
2.34.1

[PATCH 2/3] baremetal-helloworld: Move from skeleton to recipes-extended matching what rust-hello-world is doing

[Alejandro Enedino Hernandez Samaniego]

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
---
 .../baremetal-example}/baremetal-helloworld_git.bb                | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {meta-skeleton/recipes-baremetal/baremetal-examples => meta/recipes-extended/baremetal-example}/baremetal-helloworld_git.bb (100%)

diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
similarity index 100%
rename from meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
rename to meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
-- 
2.34.1

[PATCH 3/3] oe-selftest: Add baremetal toolchain test

[Alejandro Enedino Hernandez Samaniego]

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
---
 meta/lib/oeqa/selftest/cases/baremetal.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 meta/lib/oeqa/selftest/cases/baremetal.py

diff --git a/meta/lib/oeqa/selftest/cases/baremetal.py b/meta/lib/oeqa/selftest/cases/baremetal.py
new file mode 100644
index 0000000000..3f70feebad
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/baremetal.py
@@ -0,0 +1,13 @@
+
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import bitbake
+
+class BaremetalTest(OESelftestTestCase):
+        self.write_config('TCLIBC = "baremetal"')
+        bitbake('baremetal-helloworld')
-- 
2.34.1

Re: [OE-core] [PATCH 3/3] oe-selftest: Add baremetal toolchain test

[Alejandro Enedino Hernandez Samaniego]

[-- Attachment #1: Type: text/plain, Size: 1501 bytes --]

My apologies, last minute typo on this one, sending v2

Alejandro


On Sun, 8 Jan 2023 at 12:15, Alejandro Hernandez Samaniego via
lists.openembedded.org <alejandro=enedino.org@lists.openembedded.org> wrote:

> Signed-off-by: Alejandro Enedino Hernandez Samaniego <
> alejandro@enedino.org>
> ---
>  meta/lib/oeqa/selftest/cases/baremetal.py | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>  create mode 100644 meta/lib/oeqa/selftest/cases/baremetal.py
>
> diff --git a/meta/lib/oeqa/selftest/cases/baremetal.py
> b/meta/lib/oeqa/selftest/cases/baremetal.py
> new file mode 100644
> index 0000000000..3f70feebad
> --- /dev/null
> +++ b/meta/lib/oeqa/selftest/cases/baremetal.py
> @@ -0,0 +1,13 @@
> +
> +#
> +# Copyright OpenEmbedded Contributors
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +from oeqa.selftest.case import OESelftestTestCase
> +from oeqa.utils.commands import bitbake
> +
> +class BaremetalTest(OESelftestTestCase):
> +        self.write_config('TCLIBC = "baremetal"')
> +        bitbake('baremetal-helloworld')
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#175638):
> https://lists.openembedded.org/g/openembedded-core/message/175638
> Mute This Topic: https://lists.openembedded.org/mt/96137380/3619605
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alejandro@enedino.org]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 2854 bytes --]

Re: [OE-core] [PATCH 2/3] baremetal-helloworld: Move from skeleton to recipes-extended matching what rust-hello-world is doing

[Alexandre Belloni]

Hello,

This fails with:

The following recipes do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file.
baremetal-helloworld (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb)

please run oe-selftest before submitting


On 08/01/2023 12:15:24-0700, Alejandro Hernandez Samaniego wrote:
> Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
> ---
>  .../baremetal-example}/baremetal-helloworld_git.bb                | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename {meta-skeleton/recipes-baremetal/baremetal-examples => meta/recipes-extended/baremetal-example}/baremetal-helloworld_git.bb (100%)
> 
> diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> similarity index 100%
> rename from meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> rename to meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#175637): https://lists.openembedded.org/g/openembedded-core/message/175637
> Mute This Topic: https://lists.openembedded.org/mt/96137379/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 2/3] baremetal-helloworld: Move from skeleton to recipes-extended matching what rust-hello-world is doing

[Alejandro Enedino Hernandez Samaniego]

[-- Attachment #1: Type: text/plain, Size: 1957 bytes --]

I'll send a v2 that includes the matainers.inc change

Alejandro

On Wed, Jan 11, 2023, 9:17 AM Alexandre Belloni <
alexandre.belloni@bootlin.com> wrote:

> Hello,
>
> This fails with:
>
> The following recipes do not have a maintainer assigned to them. Please
> add an entry to meta/conf/distro/include/maintainers.inc file.
> baremetal-helloworld
> (/home/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/recipes-extended/baremetal-example/
> baremetal-helloworld_git.bb)
>
> please run oe-selftest before submitting
>
>
> On 08/01/2023 12:15:24-0700, Alejandro Hernandez Samaniego wrote:
> > Signed-off-by: Alejandro Enedino Hernandez Samaniego <
> alejandro@enedino.org>
> > ---
> >  .../baremetal-example}/baremetal-helloworld_git.bb                | 0
> >  1 file changed, 0 insertions(+), 0 deletions(-)
> >  rename {meta-skeleton/recipes-baremetal/baremetal-examples =>
> meta/recipes-extended/baremetal-example}/baremetal-helloworld_git.bb
> (100%)
> >
> > diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/
> baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/
> baremetal-helloworld_git.bb
> > similarity index 100%
> > rename from meta-skeleton/recipes-baremetal/baremetal-examples/
> baremetal-helloworld_git.bb
> > rename to meta/recipes-extended/baremetal-example/
> baremetal-helloworld_git.bb
> > --
> > 2.34.1
> >
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#175637):
> https://lists.openembedded.org/g/openembedded-core/message/175637
> > Mute This Topic: https://lists.openembedded.org/mt/96137379/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>

[-- Attachment #2: Type: text/html, Size: 3832 bytes --]

Re: [OE-core] [PATCH 2/3] baremetal-helloworld: Move from skeleton to recipes-extended matching what rust-hello-world is doing

[Alexandre Belloni]

Hello,

I'm taking that one but please:
 - version your patches properly, this should be v2
 - resend the whole series everytime, else I need to go back and fish
   out the previous patches. This is error prone and time consuming.

Thanks!

On 11/01/2023 21:34:44-0700, Alejandro Hernandez Samaniego wrote:
> Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
> ---
>  meta/conf/distro/include/maintainers.inc                         | 1 +
>  .../baremetal-example}/baremetal-helloworld_git.bb               | 1 +
>  2 files changed, 2 insertions(+)
>  rename {meta-skeleton/recipes-baremetal/baremetal-examples => meta/recipes-extended/baremetal-example}/baremetal-helloworld_git.bb (99%)
> 
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> index 508d10e091..8c2201c91b 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -54,6 +54,7 @@ RECIPE_MAINTAINER:pn-automake = "Robert Yang <liezhi.yang@windriver.com>"
>  RECIPE_MAINTAINER:pn-avahi = "Yi Zhao <yi.zhao@windriver.com>"
>  RECIPE_MAINTAINER:pn-babeltrace = "Alexander Kanavin <alex.kanavin@gmail.com>"
>  RECIPE_MAINTAINER:pn-babeltrace2 = "Alexander Kanavin <alex.kanavin@gmail.com>"
> +RECIPE_MAINTAINER:pn-baremetal-helloworld = "Alejandro Hernandez <alejandro@enedino.org>"
>  RECIPE_MAINTAINER:pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>"
>  RECIPE_MAINTAINER:pn-base-passwd = "Anuj Mittal <anuj.mittal@intel.com>"
>  RECIPE_MAINTAINER:pn-bash = "Hongxu Jia <hongxu.jia@windriver.com>"
> diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> similarity index 99%
> rename from meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> rename to meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> index fede17b0f0..82b2901d51 100644
> --- a/meta-skeleton/recipes-baremetal/baremetal-examples/baremetal-helloworld_git.bb
> +++ b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> @@ -8,6 +8,7 @@ SRCREV = "22016ecbb9fb6c5f3a7a06698aea7ff8a701c166"
>  PV = "0.1+git${SRCPV}"
>  
>  SRC_URI = "git://github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master"
> +UPSTREAM_VERSION_UNKNOWN="1"
>  
>  S = "${WORKDIR}/git"
>  
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#175785): https://lists.openembedded.org/g/openembedded-core/message/175785
> Mute This Topic: https://lists.openembedded.org/mt/96137379/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 2/3] baremetal-helloworld: Move from skeleton to recipes-extended matching what rust-hello-world is doing

[Alejandro Enedino Hernandez Samaniego]

[-- Attachment #1: Type: text/plain, Size: 3262 bytes --]

Understood, thanks

Alejandro

On Thu, Jan 12, 2023, 3:44 AM Alexandre Belloni <
alexandre.belloni@bootlin.com> wrote:

> Hello,
>
> I'm taking that one but please:
>  - version your patches properly, this should be v2
>  - resend the whole series everytime, else I need to go back and fish
>    out the previous patches. This is error prone and time consuming.
>
> Thanks!
>
> On 11/01/2023 21:34:44-0700, Alejandro Hernandez Samaniego wrote:
> > Signed-off-by: Alejandro Enedino Hernandez Samaniego <
> alejandro@enedino.org>
> > ---
> >  meta/conf/distro/include/maintainers.inc                         | 1 +
> >  .../baremetal-example}/baremetal-helloworld_git.bb               | 1 +
> >  2 files changed, 2 insertions(+)
> >  rename {meta-skeleton/recipes-baremetal/baremetal-examples =>
> meta/recipes-extended/baremetal-example}/baremetal-helloworld_git.bb (99%)
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> > index 508d10e091..8c2201c91b 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -54,6 +54,7 @@ RECIPE_MAINTAINER:pn-automake = "Robert Yang <
> liezhi.yang@windriver.com>"
> >  RECIPE_MAINTAINER:pn-avahi = "Yi Zhao <yi.zhao@windriver.com>"
> >  RECIPE_MAINTAINER:pn-babeltrace = "Alexander Kanavin <
> alex.kanavin@gmail.com>"
> >  RECIPE_MAINTAINER:pn-babeltrace2 = "Alexander Kanavin <
> alex.kanavin@gmail.com>"
> > +RECIPE_MAINTAINER:pn-baremetal-helloworld = "Alejandro Hernandez <
> alejandro@enedino.org>"
> >  RECIPE_MAINTAINER:pn-base-files = "Anuj Mittal <anuj.mittal@intel.com>"
> >  RECIPE_MAINTAINER:pn-base-passwd = "Anuj Mittal <anuj.mittal@intel.com
> >"
> >  RECIPE_MAINTAINER:pn-bash = "Hongxu Jia <hongxu.jia@windriver.com>"
> > diff --git a/meta-skeleton/recipes-baremetal/baremetal-examples/
> baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/
> baremetal-helloworld_git.bb
> > similarity index 99%
> > rename from meta-skeleton/recipes-baremetal/baremetal-examples/
> baremetal-helloworld_git.bb
> > rename to meta/recipes-extended/baremetal-example/
> baremetal-helloworld_git.bb
> > index fede17b0f0..82b2901d51 100644
> > --- a/meta-skeleton/recipes-baremetal/baremetal-examples/
> baremetal-helloworld_git.bb
> > +++ b/meta/recipes-extended/baremetal-example/
> baremetal-helloworld_git.bb
> > @@ -8,6 +8,7 @@ SRCREV = "22016ecbb9fb6c5f3a7a06698aea7ff8a701c166"
> >  PV = "0.1+git${SRCPV}"
> >
> >  SRC_URI = "git://
> github.com/aehs29/baremetal-helloqemu.git;protocol=https;branch=master"
> > +UPSTREAM_VERSION_UNKNOWN="1"
> >
> >  S = "${WORKDIR}/git"
> >
> > --
> > 2.34.1
> >
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#175785):
> https://lists.openembedded.org/g/openembedded-core/message/175785
> > Mute This Topic: https://lists.openembedded.org/mt/96137379/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>

[-- Attachment #2: Type: text/html, Size: 6293 bytes --]