From 9fe538c48e6f60fde0728069c95b06671438eeaa Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Thu, 25 Oct 2012 13:22:13 -0700 Subject: fri2: Update SRCREVs for linux-yocto recipes Update MACHINE and META SRCREVs to pull in the following fixes: efi: Add patch to fix 32bit EFI service mapping (rhbz 726701) mmc: sdhci: Use DBG() instead of pr_warning() on large timeout As well as the following changes to meta: eg20t: Explicitly include dependencies for PCH_GBE eg20t: Explicitly include dependencies for I2C_EG20T fri2: Remove graphics options from the core fri2 description fri2: Required boot config for fri2 fri2: Add fri2-tiny support fri2: Disable GPIO_PCH for preempt-rt Signed-off-by: Darren Hart --- meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 12 ++++++------ meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend | 4 ++-- meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) 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 index a99bb82d..2c0a8fb7 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend @@ -2,14 +2,14 @@ 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" +KBRANCH_fri2 = "standard/preempt-rt/fri2" +SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "f867af8e39af7a47b79e05b6b4ccc6cde09579ee" +SRCREV_meta_pn-linux-yocto-rt_fri2 ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 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" +KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2" +SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "f867af8e39af7a47b79e05b6b4ccc6cde09579ee" +SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" module_autoload_iwlwifi = "iwlwifi" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend index bc96859d..f9130ab7 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-tiny_3.4.bbappend @@ -4,11 +4,11 @@ COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" KBRANCH_fri2 = "standard/tiny/base" #SRCREV_machine_pn-linux-yocto-tiny_fri2 ?= "449f7f520350700858f21a5554b81cc8ad23267d" -SRCREV_meta_pn-linux-yocto-tiny_fri2 ?= "2ec32d511b62d44b63e8560a9b1d6895a5dac695" +SRCREV_meta_pn-linux-yocto-tiny_fri2 ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/tiny/base" #SRCREV_machine_pn-linux-yocto-tiny_fri2-noemgd ?= "449f7f520350700858f21a5554b81cc8ad23267d" -SRCREV_meta_pn-linux-yocto-tiny_fri2-noemgd ?= "2ec32d511b62d44b63e8560a9b1d6895a5dac695" +SRCREV_meta_pn-linux-yocto-tiny_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend index 4c004135..522c7038 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend @@ -3,13 +3,13 @@ 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" +SRCREV_machine_pn-linux-yocto_fri2 ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" +SRCREV_meta_pn-linux-yocto_fri2 ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" 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" +SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "218bd8d2022b9852c60d32f0d770931e3cf343e2" +SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "68a635bf8dfb64b02263c1ac80c948647cc76d5f" module_autoload_iwlwifi = "iwlwifi" -- cgit v1.2.3-54-g00ecf