mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>, barebox@lists.infradead.org
Subject: Re: [PATCH v2 09/13] test: add labgrid configs for some emulated targets
Date: Wed, 02 Jun 2021 13:27:39 +0200	[thread overview]
Message-ID: <112a757cb42502e98b32afdcef02a08f6bad0613.camel@pengutronix.de> (raw)
In-Reply-To: <20210531065520.12385-10-a.fatoum@pengutronix.de>

On Mon, 2021-05-31 at 08:55 +0200, Ahmad Fatoum wrote:
> There are various ways barebox can run under emulation, some of them are
> described in the documentation and some more in the git history.
> 
> Make running the emulators more convenient to use by collecting some
> known-good emulator invocations in a machine readable format.
> 
> These YAML files can be parsed by labgrid for running tests or executed
> by a new test/emulate.pl runner script that will be added in a follow-up
> commit.
> 
> Using labgrid for this will allow using the same test suite for physical
> targets as well in future.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  test/arm/a15@vexpress_defconfig.yaml     | 23 ++++++++++++++++
>  test/arm/a9@vexpress_defconfig.yaml      | 23 ++++++++++++++++
>  test/arm/qemu_virt64_defconfig.yaml      | 27 ++++++++++++++++++
>  test/arm/vexpress_defconfig.yaml         |  1 +
>  test/arm/virt@vexpress_defconfig.yaml    | 25 +++++++++++++++++
>  test/kconfig/virtio-pci.cfg              |  6 ++++
>  test/mips/be@qemu-malta_defconfig.yaml   | 25 +++++++++++++++++
>  test/mips/le@qemu-malta_defconfig.yaml   | 28 +++++++++++++++++++
>  test/mips/qemu-malta_defconfig.yaml      |  1 +
>  test/openrisc/generic_defconfig.yaml     | 23 ++++++++++++++++
>  test/riscv/qemu@virt32_defconfig.yaml    | 30 ++++++++++++++++++++
>  test/riscv/qemu@virt64_defconfig.yaml    | 30 ++++++++++++++++++++
>  test/riscv/sifive_defconfig.yaml         | 28 +++++++++++++++++++
>  test/riscv/tinyemu@virt32_defconfig.yaml | 25 +++++++++++++++++
>  test/riscv/tinyemu@virt64_defconfig.yaml | 25 +++++++++++++++++
>  test/riscv/virt32_defconfig.yaml         |  1 +
>  test/riscv/virt64_defconfig.yaml         |  1 +
>  test/sandbox/sandbox_defconfig.yaml      | 12 ++++++++
>  test/x86/efi_defconfig.yaml              |  1 +
>  test/x86/pc@efi_defconfig.yaml           | 34 +++++++++++++++++++++++
>  test/x86/q35@efi_defconfig.yaml          | 34 +++++++++++++++++++++++
>  test/x86/virtio@efi_defconfig.yaml       | 35 ++++++++++++++++++++++++
>  22 files changed, 438 insertions(+)
>  create mode 100644 test/arm/a15@vexpress_defconfig.yaml
>  create mode 100644 test/arm/a9@vexpress_defconfig.yaml
>  create mode 100644 test/arm/qemu_virt64_defconfig.yaml
>  create mode 120000 test/arm/vexpress_defconfig.yaml
>  create mode 100644 test/arm/virt@vexpress_defconfig.yaml
>  create mode 100644 test/kconfig/virtio-pci.cfg
>  create mode 100644 test/mips/be@qemu-malta_defconfig.yaml
>  create mode 100644 test/mips/le@qemu-malta_defconfig.yaml
>  create mode 120000 test/mips/qemu-malta_defconfig.yaml
>  create mode 100644 test/openrisc/generic_defconfig.yaml
>  create mode 100644 test/riscv/qemu@virt32_defconfig.yaml
>  create mode 100644 test/riscv/qemu@virt64_defconfig.yaml
>  create mode 100644 test/riscv/sifive_defconfig.yaml
>  create mode 100644 test/riscv/tinyemu@virt32_defconfig.yaml
>  create mode 100644 test/riscv/tinyemu@virt64_defconfig.yaml
>  create mode 120000 test/riscv/virt32_defconfig.yaml
>  create mode 120000 test/riscv/virt64_defconfig.yaml
>  create mode 100644 test/sandbox/sandbox_defconfig.yaml
>  create mode 120000 test/x86/efi_defconfig.yaml
>  create mode 100644 test/x86/pc@efi_defconfig.yaml
>  create mode 100644 test/x86/q35@efi_defconfig.yaml
>  create mode 100644 test/x86/virtio@efi_defconfig.yaml
> 
> diff --git a/test/arm/a15@vexpress_defconfig.yaml b/test/arm/a15@vexpress_defconfig.yaml
> new file mode 100644
> index 000000000000..7ed93ba0a19f
> --- /dev/null
> +++ b/test/arm/a15@vexpress_defconfig.yaml
> @@ -0,0 +1,23 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: vexpress-a15
> +        cpu: cortex-a15
> +        memory: 1024M
> +        bios: barebox-vexpress-ca15.img
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'

All of these targets use a Shelldriver, but it is used only to satisfy
the BareboxStrategy. Scrap the ShellDriver and write a short strategy
or scrap the strategy as well or wholesale remove strategy usage
alltogether. Since all thats done is activating the BareboxDriver, this
should be doable without a strategy.

> +      BareboxStrategy: {}
> +images:
> +  barebox-vexpress-ca15.img: $LG_BUILDDIR/images/barebox-vexpress-ca15.img
> +tools:
> +  qemu: /usr/bin/qemu-system-arm
> diff --git a/test/arm/a9@vexpress_defconfig.yaml b/test/arm/a9@vexpress_defconfig.yaml
> new file mode 100644
> index 000000000000..88e09ca052e6
> --- /dev/null
> +++ b/test/arm/a9@vexpress_defconfig.yaml
> @@ -0,0 +1,23 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: vexpress-a9
> +        cpu: cortex-a9
> +        memory: 1024M
> +        bios: barebox-vexpress-ca9.img
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +images:
> +  barebox-vexpress-ca9.img: $LG_BUILDDIR/images/barebox-vexpress-ca9.img
> +tools:
> +  qemu: /usr/bin/qemu-system-arm
> diff --git a/test/arm/qemu_virt64_defconfig.yaml b/test/arm/qemu_virt64_defconfig.yaml
> new file mode 100644
> index 000000000000..2dfaaedef61a
> --- /dev/null
> +++ b/test/arm/qemu_virt64_defconfig.yaml
> @@ -0,0 +1,27 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: virt
> +        cpu: cortex-a57
> +        memory: 1024M
> +        kernel: barebox-dt-2nd.img
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-mmio
> +    runner:
> +      tuxmake_arch: arm64
> +images:
> +  barebox-dt-2nd.img: $LG_BUILDDIR/images/barebox-dt-2nd.img
> +tools:
> +  qemu: /usr/bin/qemu-system-aarch64
> diff --git a/test/arm/vexpress_defconfig.yaml b/test/arm/vexpress_defconfig.yaml
> new file mode 120000
> index 000000000000..732f51b19dc9
> --- /dev/null
> +++ b/test/arm/vexpress_defconfig.yaml
> @@ -0,0 +1 @@
> +a9@vexpress_defconfig.yaml
> \ No newline at end of file
> diff --git a/test/arm/virt@vexpress_defconfig.yaml b/test/arm/virt@vexpress_defconfig.yaml
> new file mode 100644
> index 000000000000..9c2e727c9cb5
> --- /dev/null
> +++ b/test/arm/virt@vexpress_defconfig.yaml
> @@ -0,0 +1,25 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: virt
> +        cpu: cortex-a7
> +        memory: 1024M
> +        kernel: barebox-dt-2nd.img
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-mmio
> +images:
> +  barebox-dt-2nd.img: $LG_BUILDDIR/images/barebox-dt-2nd.img
> +tools:
> +  qemu: /usr/bin/qemu-system-arm
> diff --git a/test/kconfig/virtio-pci.cfg b/test/kconfig/virtio-pci.cfg
> new file mode 100644
> index 000000000000..78237b8fca26
> --- /dev/null
> +++ b/test/kconfig/virtio-pci.cfg
> @@ -0,0 +1,6 @@
> +CONFIG_VIRTIO_MENU=y
> +CONFIG_VIRTIO_PCI=y
> +CONFIG_VIRTIO_CONSOLE=y
> +CONFIG_VIRTIO_BLK=y
> +CONFIG_HWRNG=y
> +CONFIG_HW_RANDOM_VIRTIO=y
> diff --git a/test/mips/be@qemu-malta_defconfig.yaml b/test/mips/be@qemu-malta_defconfig.yaml
> new file mode 100644
> index 000000000000..5217a6ec2a13
> --- /dev/null
> +++ b/test/mips/be@qemu-malta_defconfig.yaml
> @@ -0,0 +1,25 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: malta
> +        cpu: M14Kc
> +        memory: 256M
> +        bios: barebox-qemu-malta.img
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-pci
> +images:
> +  barebox-qemu-malta.img: $LG_BUILDDIR/images/barebox-qemu-malta.img
> +tools:
> +  qemu: /usr/bin/qemu-system-mips
> diff --git a/test/mips/le@qemu-malta_defconfig.yaml b/test/mips/le@qemu-malta_defconfig.yaml
> new file mode 100644
> index 000000000000..3b0f557dde5b
> --- /dev/null
> +++ b/test/mips/le@qemu-malta_defconfig.yaml
> @@ -0,0 +1,28 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: malta
> +        cpu: M14Kc
> +        memory: 256M
> +        bios: barebox-qemu-malta.img.swapped
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-pci
> +    runner:
> +      kconfig_add:
> +        - CONFIG_CPU_LITTLE_ENDIAN=y
> +images:
> +  barebox-qemu-malta.img.swapped: $LG_BUILDDIR/images/barebox-qemu-malta.img.swapped
> +tools:
> +  qemu: /usr/bin/qemu-system-mipsel
> diff --git a/test/mips/qemu-malta_defconfig.yaml b/test/mips/qemu-malta_defconfig.yaml
> new file mode 120000
> index 000000000000..481b6e547782
> --- /dev/null
> +++ b/test/mips/qemu-malta_defconfig.yaml
> @@ -0,0 +1 @@
> +be@qemu-malta_defconfig.yaml
> \ No newline at end of file
> diff --git a/test/openrisc/generic_defconfig.yaml b/test/openrisc/generic_defconfig.yaml
> new file mode 100644
> index 000000000000..ece54da1c191
> --- /dev/null
> +++ b/test/openrisc/generic_defconfig.yaml
> @@ -0,0 +1,23 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: or1k-sim
> +        cpu: or1200
> +        memory: 256M
> +        kernel: barebox
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +images:
> +  barebox: $LG_BUILDDIR/barebox
> +tools:
> +  qemu: /usr/bin/qemu-system-or1k
> diff --git a/test/riscv/qemu@virt32_defconfig.yaml b/test/riscv/qemu@virt32_defconfig.yaml
> new file mode 100644
> index 000000000000..d879ac6880a7
> --- /dev/null
> +++ b/test/riscv/qemu@virt32_defconfig.yaml
> @@ -0,0 +1,30 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: virt
> +        cpu: rv32
> +        memory: 256M
> +        kernel: barebox-dt-2nd.img
> +        bios: opensbi-riscv32-generic-fw_dynamic.bin
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-mmio
> +    runner:
> +      download:
> +        opensbi-riscv32-generic-fw_dynamic.bin: https://github.com/qemu/qemu/blob/v5.2.0/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin?raw=true
> +images:
> +  barebox-dt-2nd.img: $LG_BUILDDIR/images/barebox-dt-2nd.img
> +  opensbi-riscv32-generic-fw_dynamic.bin: $LG_BUILDDIR/opensbi-riscv32-generic-fw_dynamic.bin
> +tools:
> +  qemu: /usr/bin/qemu-system-riscv32
> diff --git a/test/riscv/qemu@virt64_defconfig.yaml b/test/riscv/qemu@virt64_defconfig.yaml
> new file mode 100644
> index 000000000000..5102f9067e1b
> --- /dev/null
> +++ b/test/riscv/qemu@virt64_defconfig.yaml
> @@ -0,0 +1,30 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: virt
> +        cpu: rv64
> +        memory: 256M
> +        kernel: barebox-dt-2nd.img
> +        bios: opensbi-riscv64-generic-fw_dynamic.bin
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-mmio
> +    runner:
> +      download:
> +        opensbi-riscv64-generic-fw_dynamic.bin: https://github.com/qemu/qemu/blob/v5.2.0/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin?raw=true
> +images:
> +  barebox-dt-2nd.img: $LG_BUILDDIR/images/barebox-dt-2nd.img
> +  opensbi-riscv64-generic-fw_dynamic.bin: $LG_BUILDDIR/opensbi-riscv64-generic-fw_dynamic.bin
> +tools:
> +  qemu: /usr/bin/qemu-system-riscv64
> diff --git a/test/riscv/sifive_defconfig.yaml b/test/riscv/sifive_defconfig.yaml
> new file mode 100644
> index 000000000000..534d7b8b044a
> --- /dev/null
> +++ b/test/riscv/sifive_defconfig.yaml
> @@ -0,0 +1,28 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: sifive_u
> +        cpu: sifive-u54
> +        memory: 256M
> +        kernel: barebox-hifive-unleashed.img
> +        bios: opensbi-riscv64-generic-fw_dynamic.bin
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    runner:
> +      download:
> +        opensbi-riscv64-generic-fw_dynamic.bin: https://github.com/qemu/qemu/blob/v5.2.0/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin?raw=true
> +images:
> +  barebox-hifive-unleashed.img: $LG_BUILDDIR/images/barebox-hifive-unleashed.img
> +  opensbi-riscv64-generic-fw_dynamic.bin: $LG_BUILDDIR/opensbi-riscv64-generic-fw_dynamic.bin
> +tools:
> +  qemu: /usr/bin/qemu-system-riscv64
> diff --git a/test/riscv/tinyemu@virt32_defconfig.yaml b/test/riscv/tinyemu@virt32_defconfig.yaml
> new file mode 100644
> index 000000000000..807a8ce47145
> --- /dev/null
> +++ b/test/riscv/tinyemu@virt32_defconfig.yaml
> @@ -0,0 +1,25 @@
> +targets:
> +  main:
> +    drivers:
> +      TinyEMUDriver:
> +        temu_bin: temu
> +        config: ./Documentation/boards/riscv/barebox-virt32.cfg
> +        image: barebox-dt-2nd.img
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-mmio
> +    runner:
> +      download:
> +        bbl32.bin: https://barebox.org/jsbarebox/bbl32.bin
> +images:
> +  barebox-dt-2nd.img: $LG_BUILDDIR/images/barebox-dt-2nd.img
> +tools:
> +  temu: /usr/local/bin/temu
> diff --git a/test/riscv/tinyemu@virt64_defconfig.yaml b/test/riscv/tinyemu@virt64_defconfig.yaml
> new file mode 100644
> index 000000000000..58277d1ce0dc
> --- /dev/null
> +++ b/test/riscv/tinyemu@virt64_defconfig.yaml
> @@ -0,0 +1,25 @@
> +targets:
> +  main:
> +    drivers:
> +      TinyEMUDriver:
> +        temu_bin: temu
> +        config: ./Documentation/boards/riscv/barebox-virt64.cfg
> +        image: barebox-dt-2nd.img
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-mmio
> +    runner:
> +      download:
> +        bbl64.bin: https://barebox.org/jsbarebox/bbl64.bin
> +images:
> +  barebox-dt-2nd.img: $LG_BUILDDIR/images/barebox-dt-2nd.img
> +tools:
> +  temu: /usr/local/bin/temu
> diff --git a/test/riscv/virt32_defconfig.yaml b/test/riscv/virt32_defconfig.yaml
> new file mode 120000
> index 000000000000..e9d7237f5339
> --- /dev/null
> +++ b/test/riscv/virt32_defconfig.yaml
> @@ -0,0 +1 @@
> +qemu@virt32_defconfig.yaml
> \ No newline at end of file
> diff --git a/test/riscv/virt64_defconfig.yaml b/test/riscv/virt64_defconfig.yaml
> new file mode 120000
> index 000000000000..ab419d5e7fb4
> --- /dev/null
> +++ b/test/riscv/virt64_defconfig.yaml
> @@ -0,0 +1 @@
> +qemu@virt64_defconfig.yaml
> \ No newline at end of file
> diff --git a/test/sandbox/sandbox_defconfig.yaml b/test/sandbox/sandbox_defconfig.yaml
> new file mode 100644
> index 000000000000..68826e8b5830
> --- /dev/null
> +++ b/test/sandbox/sandbox_defconfig.yaml
> @@ -0,0 +1,12 @@
> +targets:
> +  main:
> +    drivers:
> +      NativeExecutableDriver:
> +        command: ./barebox
> +        image: barebox
> +    runner:
> +      tuxmake_arch: um
> +images:
> +  barebox: $LG_BUILDDIR/barebox
> +tools:
> +  qemu: /usr/local/bin/temu
> diff --git a/test/x86/efi_defconfig.yaml b/test/x86/efi_defconfig.yaml
> new file mode 120000
> index 000000000000..942dc259d56b
> --- /dev/null
> +++ b/test/x86/efi_defconfig.yaml
> @@ -0,0 +1 @@
> +pc@efi_defconfig.yaml
> \ No newline at end of file
> diff --git a/test/x86/pc@efi_defconfig.yaml b/test/x86/pc@efi_defconfig.yaml
> new file mode 100644
> index 000000000000..923b0680fff2
> --- /dev/null
> +++ b/test/x86/pc@efi_defconfig.yaml
> @@ -0,0 +1,34 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: pc
> +        cpu: Nehalem
> +        memory: 1024M
> +        kernel: barebox.efi
> +        bios: OVMF.fd
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - pci
> +    runner:
> +      tuxmake_arch: x86_64
> +      kconfig_add:
> +        - CONFIG_DRIVER_SERIAL_NS16550=y
> +        - CONFIG_CONSOLE_ACTIVATE_FIRST=y # avoid duplicate output
> +      download:
> +        OVMF.fd: /usr/share/qemu/OVMF.fd
> +images:
> +  barebox.efi: $LG_BUILDDIR/barebox.efi
> +  OVMF.fd: $LG_BUILDDIR/OVMF.fd
> +tools:
> +  qemu: /usr/bin/qemu-system-x86_64
> diff --git a/test/x86/q35@efi_defconfig.yaml b/test/x86/q35@efi_defconfig.yaml
> new file mode 100644
> index 000000000000..1cfbd9fd88e3
> --- /dev/null
> +++ b/test/x86/q35@efi_defconfig.yaml
> @@ -0,0 +1,34 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: q35
> +        cpu: Nehalem
> +        memory: 1024M
> +        kernel: barebox.efi
> +        bios: OVMF.fd
> +        extra_args: -global ICH9-LPC.noreboot=false
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - pci
> +    runner:
> +        tuxmake_arch: x86_64
> +        kconfig_add:
> +            - CONFIG_DRIVER_SERIAL_NS16550=y
> +            - CONFIG_CONSOLE_ACTIVATE_FIRST=y # avoid duplicate output
> +        download:
> +            OVMF.fd: /usr/share/qemu/OVMF.fd
> +images:
> +  barebox.efi: $LG_BUILDDIR/barebox.efi
> +  OVMF.fd: $LG_BUILDDIR/OVMF.fd
> +tools:
> +  qemu: /usr/bin/qemu-system-x86_64
> diff --git a/test/x86/virtio@efi_defconfig.yaml b/test/x86/virtio@efi_defconfig.yaml
> new file mode 100644
> index 000000000000..3c9a9ae51e23
> --- /dev/null
> +++ b/test/x86/virtio@efi_defconfig.yaml
> @@ -0,0 +1,35 @@
> +targets:
> +  main:
> +    drivers:
> +      QEMUDriver:
> +        qemu_bin: qemu
> +        machine: pc
> +        cpu: Nehalem
> +        memory: 1024M
> +        kernel: barebox.efi
> +        bios: OVMF.fd
> +        extra_args: ''
> +      BareboxDriver:
> +        prompt: 'barebox@[^:]+:[^ ]+ '
> +        bootstring: 'commandline:'
> +      ShellDriver:
> +        prompt: 'root@\w+:[^ ]+ '
> +        login_prompt: ' login: '
> +        login_timeout: 90
> +        username: 'root'
> +      BareboxStrategy: {}
> +    features:
> +      - virtio-pci
> +    runner:
> +      tuxmake_arch: x86_64
> +      kconfig_add:
> +        - test/kconfig/virtio-pci.cfg
> +        - CONFIG_DRIVER_SERIAL_NS16550=y
> +        - CONFIG_CONSOLE_ACTIVATE_FIRST=y # avoid duplicate output
> +      download:
> +        OVMF.fd: /usr/share/qemu/OVMF.fd
> +images:
> +  barebox.efi: $LG_BUILDDIR/barebox.efi
> +  OVMF.fd: $LG_BUILDDIR/OVMF.fd
> +tools:
> +  qemu: /usr/bin/qemu-system-x86_64



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  reply	other threads:[~2021-06-02 11:55 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-31  6:55 [PATCH v2 00/13] add barebox in-tree testing infrastructure Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 01/13] kbuild: add install target Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 02/13] kbuild: add ARCH={i386, x86_64} as aliases for x86 Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 03/13] kbuild: add ARCH=um alias for sandbox Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 04/13] MIPS: qemu-malta: generate swapped image as part of multi-image build Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 05/13] openrisc: set default KBUILD_IMAGE Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 06/13] Documentation: boards: RISC-V: update TinyEMU support Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 07/13] test: add basic barebox self-test infrastructure Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 08/13] test: self: port Linux printf kselftest Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 09/13] test: add labgrid configs for some emulated targets Ahmad Fatoum
2021-06-02 11:27   ` Rouven Czerwinski [this message]
2021-06-02 11:34     ` Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 10/13] test: add first sample tests Ahmad Fatoum
2021-06-02 11:33   ` Rouven Czerwinski
2021-06-02 11:35     ` Ahmad Fatoum
2021-06-03 15:14       ` Jan Lübbe
2021-06-03 15:31         ` Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 11/13] test: add emulate.pl, a runner for barebox on emulated targets Ahmad Fatoum
2021-05-31  6:55 ` [PATCH v2 12/13] test: self: run selftests as part of the pytest suite Ahmad Fatoum
2021-06-02 11:36   ` Rouven Czerwinski
2021-05-31  6:55 ` [PATCH v2 13/13] test: add bthread test Ahmad Fatoum

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=112a757cb42502e98b32afdcef02a08f6bad0613.camel@pengutronix.de \
    --to=r.czerwinski@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox