summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common
diff options
context:
space:
mode:
authornkskjames <nkskjames@gmail.com>2015-11-23 10:23:06 -0600
committernkskjames <nkskjames@gmail.com>2015-11-23 10:23:06 -0600
commit3ad2f9e3c288c586d70edca60fea207224a8cbe0 (patch)
tree96f1689109a5708007a2686c87dc1a4a6cc9d1a2 /meta-phosphor/common
parent4191fcc52505dc02668bf1972bf318525a071d44 (diff)
parent71d5153e76ec45947cc006ee2b2275b9fbf08c42 (diff)
downloadtalos-openbmc-3ad2f9e3c288c586d70edca60fea207224a8cbe0.tar.gz
talos-openbmc-3ad2f9e3c288c586d70edca60fea207224a8cbe0.zip
Merge pull request #89 from bradbishop/dtree
switch back to in-tree device trees
Diffstat (limited to 'meta-phosphor/common')
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb (renamed from meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb)6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb
index 1d8106d82..2b2ff39f1 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.2.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.3.bb
@@ -2,15 +2,15 @@ DESCRIPTION = "Linux kernel for OpenBMC"
SECTION = "kernel"
LICENSE = "GPLv2"
-KBRANCH ?= "dev"
+KBRANCH ?= "dev-4.3"
KCONFIG_MODE="--alldefconfig"
SRC_URI = "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
-LINUX_VERSION ?= "4.2"
+LINUX_VERSION ?= "4.3"
LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
-SRCREV="openbmc-20151104-1"
+SRCREV="openbmc-20151123-1"
PV = "${LINUX_VERSION}+git${SRCPV}"
OpenPOWER on IntegriCloud