diff options
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf index de3b27987d..460f269f8c 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | |||
@@ -2,7 +2,6 @@ | |||
2 | #@NAME: {{=machine}} | 2 | #@NAME: {{=machine}} |
3 | 3 | ||
4 | #@DESCRIPTION: Machine configuration for {{=machine}} systems | 4 | #@DESCRIPTION: Machine configuration for {{=machine}} systems |
5 | |||
6 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} | 5 | {{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} |
7 | {{ if kernel_choice == "custom": }} | 6 | {{ if kernel_choice == "custom": }} |
8 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" | 7 | PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" |
@@ -43,6 +42,7 @@ require conf/machine/include/tune-mips32.inc | |||
43 | MACHINE_FEATURES += "x86" | 42 | MACHINE_FEATURES += "x86" |
44 | KERNEL_IMAGETYPE = "bzImage" | 43 | KERNEL_IMAGETYPE = "bzImage" |
45 | SERIAL_CONSOLE = "115200 ttyS0" | 44 | SERIAL_CONSOLE = "115200 ttyS0" |
45 | |||
46 | # We bypass swrast but we need it to be present for X to load correctly | 46 | # We bypass swrast but we need it to be present for X to load correctly |
47 | XSERVER ?= "xserver-xorg \ | 47 | XSERVER ?= "xserver-xorg \ |
48 | mesa-dri-driver-swrast \ | 48 | mesa-dri-driver-swrast \ |
@@ -50,6 +50,7 @@ XSERVER ?= "xserver-xorg \ | |||
50 | xf86-input-keyboard \ | 50 | xf86-input-keyboard \ |
51 | xf86-input-evdev \ | 51 | xf86-input-evdev \ |
52 | xf86-video-vmware" | 52 | xf86-video-vmware" |
53 | |||
53 | require conf/machine/include/qemu.inc | 54 | require conf/machine/include/qemu.inc |
54 | 55 | ||
55 | {{ if qemuarch == "arm": }} | 56 | {{ if qemuarch == "arm": }} |