diff options
Diffstat (limited to 'meta-fri2')
-rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 2 | ||||
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 6 | ||||
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 15 | ||||
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 15 |
4 files changed, 34 insertions, 4 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index 92052927..3c25817c 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf @@ -11,7 +11,7 @@ MACHINE_FEATURES += "wifi 3g pcbios efi" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto = "3.2%" +PREFERRED_VERSION_linux-yocto = "3.4%" XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_EXT} \ diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 39fb6984..dff11a88 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -15,7 +15,7 @@ MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto = "3.2%" +PREFERRED_VERSION_linux-yocto = "3.4%" XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_EXT} \ @@ -23,9 +23,9 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ " PREFERRED_VERSION_xserver-xorg ?= "1.9.3" -PREFERRED_VERSION_mesa-dri ?= "7.11" +PREFERRED_VERSION_mesa-dri ?= "8.0.4" PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" -PREFERRED_VERSION_emgd-driver-bin ?= "1.10" +PREFERRED_VERSION_emgd-driver-bin ?= "1.14" # Syslinux does not know about the 64MHz uart clock and it does not detect the # serial device by number. Use the IO port directly and divide the baud down to diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend new file mode 100644 index 00000000..a99bb82d --- /dev/null +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_fri2 = "fri2" +KMACHINE_fri2 = "fri2" +#KBRANCH_fri2 = "standard/preempt-rt/fri2" +SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "4ed758e1861621b6db687498e88991b5034cfa78" +#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= #"c5bddf8ea379406ffec550528e17b777a0eba24b" + +COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" +KMACHINE_fri2-noemgd = "fri2" +#KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2" +SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "4ed758e1861621b6db687498e88991b5034cfa78" +#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "c5bddf8ea379406ffec550528e17b777a0eba24b" + +module_autoload_iwlwifi = "iwlwifi" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend new file mode 100644 index 00000000..4c004135 --- /dev/null +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_fri2 = "fri2" +KMACHINE_fri2 = "fri2" +KBRANCH_fri2 = "standard/fri2" +SRCREV_machine_pn-linux-yocto_fri2 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff" +#SRCREV_meta_pn-linux-yocto_fri2 ?= "c5bddf8ea379406ffec550528e17b777a0eba24b" + +COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" +KMACHINE_fri2-noemgd = "fri2" +KBRANCH_fri2-noemgd = "standard/fri2" +SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "59c3ff750831338d05ab67d5efd7fc101c451aff" +#SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "c5bddf8ea379406ffec550528e17b777a0eba24b" + +module_autoload_iwlwifi = "iwlwifi" |