diff options
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/i386')
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf index a33cb2edb3..268ddc82d4 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | |||
@@ -58,8 +58,9 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
58 | 58 | ||
59 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 59 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} |
60 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 60 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
61 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 61 | PREFERRED_VERSION_mesa-dri ?= "9.0.2" |
62 | PREFERRED_VERSION_emgd-driver-bin ?= "1.14" | 62 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
63 | PREFERRED_VERSION_emgd-driver-bin ?= "1.16" | ||
63 | 64 | ||
64 | {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} | 65 | {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} |
65 | APPEND += "video=vesafb vga=0x318" | 66 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" |
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc index e34882f93d..1b22eab9ad 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc +++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc | |||
@@ -7,8 +7,7 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) | |||
7 | branch {{=machine}} | 7 | branch {{=machine}} |
8 | 8 | ||
9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} | 9 | {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} |
10 | include features/emgd/emgd-1.14.scc | 10 | include features/drm-emgd/emgd-1.16.scc |
11 | git merge emgd-1.14 | ||
12 | 11 | ||
13 | include {{=machine}}.scc | 12 | include {{=machine}}.scc |
14 | 13 | ||