From 4195be144fa61d8c76da33b4cb6e48dcf888912e Mon Sep 17 00:00:00 2001
From: Doyle Huang <doyle.sy.huang@mail.foxconn.com>
Date: Fri, 13 Apr 2018 11:46:56 +0800
Subject: [PATCH] bump to G2 to v01.10.2560

Change-Id: I20ca7bf38b1021b493637c6f67cb5f5875a8d1f7
Signed-off-by: Doyle Huang <doyle.sy.huang@mail.foxconn.com>
---
 meta-phosphor/classes/skeleton-rev.bbclass                   | 2 +-
 meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc           | 2 +-
 meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb | 4 ++--
 .../common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb | 2 +-
 .../recipes-phosphor/flash/phosphor-software-manager.bb      | 5 +++--
 .../common/recipes-phosphor/sensors/phosphor-hwmon.bb        | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass
index 21827c854b89..2649c36a9c5d 100644
--- a/meta-phosphor/classes/skeleton-rev.bbclass
+++ b/meta-phosphor/classes/skeleton-rev.bbclass
@@ -1,3 +1,3 @@
 DEPENDS += "i2c-tools"
-SRCREV ?= "4284d9bbe3d1fdedaad6d5745bcdd8dc4b9a1d85"
+SRCREV ?= "c21411d59c4bd9105d75624c7db728f127e189a2"
 SKELETON_URI ?= "git://github.com/foxconn-bmc-ks/skeleton;branch=foxconn-g2"
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc
index 01207555592c..ef50d5af4cd7 100644
--- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc
+++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc
@@ -1,6 +1,6 @@
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
 
-SRCREV = "33d6f5e30f27b4bbe779c31635c6a0c3487e824b"
+SRCREV = "6eba64d43c95de96fef377a957f471b92784540f"
 UBRANCH = "foxconn-v2016.07-aspeed-openbmc-g2"
 SRC_URI = "git://git@github.com/foxconn-bmc-ks/u-boot.git;branch=${UBRANCH};protocol=https"
 
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb
index ec7ee3ee757c..5e6da4b32cff 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.13.bb
@@ -1,6 +1,6 @@
-KBRANCH ?= "dev-4.13"
+KBRANCH ?= "foxconn-g2-4.13 "
 LINUX_VERSION ?= "4.13.16"
 
-SRCREV="462662bc3577d0c73e30cdc96eb28d63c89528df"
+SRCREV="34b742f797ab5baf9ff804b5326f019ad3a7a60c"
 
 require linux-obmc.inc
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
index 5c1696d57861..d5ccccffbf4a 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb
@@ -14,7 +14,7 @@ DEPENDS += "sdbus++-native"
 
 FOXCONN_BRANCH="foxconn-g2"
 SRC_URI += "git://github.com/foxconn-bmc-ks/phosphor-dbus-interfaces;branch=${FOXCONN_BRANCH}"
-SRCREV = "01fc62cef0b799815f330babfcf0de800dab9f3a"
+SRCREV = "fa7e5993d12543fb4ccd433fc6e38b018607e320"
 
 DEPENDS_remove_class-native = "sdbus++-native"
 DEPENDS_remove_class-nativesdk = "sdbus++-native"
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
index 8c16712afd90..8d0d7b641f5d 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -96,7 +96,8 @@ do_install_append() {
     install -d ${D}/usr/local
 }
 
-SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt"
-SRCREV = "7a248bc7c30ed1fdb7d6b4255eea2430852333d1"
+FOXCONN_BRANCH="foxconn-g2"
+SRC_URI += "git://github.com/foxconn-bmc-ks/phosphor-bmc-code-mgmt;branch=${FOXCONN_BRANCH}"
+SRCREV = "6a6277517d3be761c0d1f88dcafa6fb0a0ca4d9d"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb
index 6a0272f9e19b..806aaa8067e7 100644
--- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb
+++ b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb
@@ -39,7 +39,7 @@ SRC_URI += "file://70-hwmon.rules"
 SRC_URI += "file://70-iio.rules"
 SRC_URI += "file://start_hwmon.sh"
 
-SRCREV = "f2dc6100fc439fa0da825ce2c81aa1834a97effc"
+SRCREV = "743eba019385711da24c20c49ad7b6789a5c36b5"
 
 S = "${WORKDIR}/git"