diff options
| author | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-11-21 12:41:49 +0000 |
|---|---|---|
| committer | Guillaume Tucker <guillaume.tucker@collabora.com> | 2018-12-07 13:23:52 +0000 |
| commit | 500ec0f79a2968c6e83d6f44e251d2aa1f9e2806 (patch) | |
| tree | 0d808cc5b4534096db0717b36552acec797c999e /templates | |
| parent | b7ae84b56f96861d7055ce38c4de9cd493ce6ced (diff) | |
Split x86 into i386 and x86_64
In order to be able to test with both 32-bit and 64-bit user-space on
x86, use i386 and x86_64 arch names explicitly. The main difference
is that test plans using Debian will now be running with a 64-bit
user-space on x86_64 platforms instead of 32-bit. There is no 64-bit
Buildroot file system image available for the time being.
* update test-configs.yaml with new arch maps for each file system
type to deal with both i386 and x86_64
* update the arch value for x86 devices so they are now either i386 or
x86_64
* update defconfig filters in test-configs.yaml as the defconfig for
these archs is now "defconfig" rather than i386_defconfig and
x86_64_defconfig
* update qemu template for x86_64
* use the same x86 Docker images to build kernels for either i386 or
x86_64 as the native toolchains are identical for x86
Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/boot/generic-qemu-boot-template.jinja2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/boot/generic-qemu-boot-template.jinja2 b/templates/boot/generic-qemu-boot-template.jinja2 index 39736de..cc025be 100644 --- a/templates/boot/generic-qemu-boot-template.jinja2 +++ b/templates/boot/generic-qemu-boot-template.jinja2 @@ -8,7 +8,7 @@ {% set ctx_cpu = 'cortex-a57' %} {% set console_dev = 'ttyAMA0' %} {% endif %} -{% if arch == 'x86' %} +{% if arch == 'x86_64' %} {% set ctx_arch = 'x86_64' %} {% set ctx_cpu = 'qemu64' %} {% set console_dev = 'ttyS0' %} |