From 964d5daa7cea2b357c68eb2c91d17779eeba6a49 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 4 Sep 2014 15:34:11 -0700 Subject: Remove fri2 machine support The fri2 machine has been retired with this commit. This does not affect the fri2-noemgd machine and it is supported as usual. Signed-off-by: Nitin A Kamble Signed-off-by: Tom Zanussi --- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | 7 ------- meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend | 8 -------- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 11 ----------- 3 files changed, 26 deletions(-) (limited to 'meta-fri2/recipes-kernel/linux') diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend index 25361e88..375a0c72 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend @@ -1,16 +1,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_fri2 = "fri2" -KMACHINE_fri2 = "fri2" -KBRANCH_fri2 = "standard/preempt-rt/fri2" -SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "b669af08737562ef86e7cba328966d05222d3e64" -#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= "XXX" - 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 ?= "b669af08737562ef86e7cba328966d05222d3e64" #SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "XXX" -KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi" KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend index b4d2dfd6..3514fc6f 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.10.bbappend @@ -1,13 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_fri2 = "fri2" -KMACHINE_fri2 = "fri2" -KBRANCH_fri2 = "standard/tiny/base" -#SRCREV_machine_pn-linux-yocto-tiny_fri2 ?= "XXX" -#SRCREV_meta_pn-linux-yocto-tiny_fri2 ?= "XXX" - - COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/tiny/base" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index bfbb7540..1fdeb219 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,15 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_fri2 = "fri2" -KMACHINE_fri2 = "fri2" -KBRANCH_fri2 = "standard/fri2" -KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" -LINUX_VERSION_fri2 = "3.10.38" -SRCREV_meta_fri2 = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" -SRCREV_machine_fri2 = "02f7e63e56c061617957388c23bd5cf9b05c5388" -SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" -SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" - COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" @@ -18,5 +8,4 @@ LINUX_VERSION_fri2-noemgd = "3.10.38" SRCREV_meta_fri2-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473" SRCREV_machine_fri2-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388" -KERNEL_MODULE_AUTOLOAD_append_fri2 = " iwlwifi" KERNEL_MODULE_AUTOLOAD_append_fri2-noemgd = " iwlwifi" -- cgit v1.2.3-54-g00ecf