linux-msm7xxxx: update SRCREV and SRCURI, don't install the upstream defconfigs in...

diff --git a/packages/linux/linux-msm7xxxx_git.bb b/packages/linux/linux-msm7xxxx_git.bb
index c0d2617..e902947 100644 (file)
--- a/packages/linux/linux-msm7xxxx_git.bb
+++ b/packages/linux/linux-msm7xxxx_git.bb
@@ -1,38 +1,22 @@
 require linux.inc
 
 PV = "2.6.25+${PR}+gitr${SRCREV}"
-PV_htckaiser = "2.6.24+${PR}+gitr${SRCREV}"
-PV_htcpolaris = "2.6.24+${PR}+gitr${SRCREV}"
 PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}"
 PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}"
 PR = "r4"
 
-COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcraphael|htcdiamond|htcvogue|htctitan"
+COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcvogue|htctitan|htcnike|htcraphael|htcdiamond"
 
-SRCREV_htckaiser = "1082670ccae30e6592311cc9dee93ba978382a25"
-SRCREV_htcpolaris = "1082670ccae30e6592311cc9dee93ba978382a25"
-SRCREV_htcraphael = "05e144ae16c252bd8f4d0e53faf14c58a74d8c0f"
-SRCREV_htcdiamond = "05e144ae16c252bd8f4d0e53faf14c58a74d8c0f"
-SRCREV_htcvogue = "8cfc6730b38091c908b2df3b906a3a54f27e1bb2"
-SRCREV_htctitan = "8cfc6730b38091c908b2df3b906a3a54f27e1bb2"
+SRCREV = "21895dc01b196bafbfeb13219a7689b96d80bdd6"
+SRCREV_htcraphael = "ed619deca2d062ba190f7e79aafcd8428559ccac"
+SRCREV_htcdiamond = "ed619deca2d062ba190f7e79aafcd8428559ccac"
 
-SRC_BRANCH = "htc-msm-2.6.25"
-SRC_BRANCH_htckaiser = "htc-msm"
-SRC_BRANCH_htcpolaris = "htc-msm"
+SRC_BRANCH = "htc-vogue"
 SRC_BRANCH_htcraphael = "htc-msm-2.6.27"
-SRC_BRANCH_htcvogue = "htc-vogue"
-SRC_BRANCH_htctitan = "htc-vogue"
+SRC_BRANCH_htcdiamond = "htc-msm-2.6.27"
 
 SRC_URI = "\
   git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=${SRC_BRANCH};protocol=git \
   file://defconfig \
 "
 S = "${WORKDIR}/git"
-
-do_configure_prepend_htcraphael() {
-       install -m 0644 arch/arm/configs/${MACHINE}_defconfig ${WORKDIR}/defconfig
-}
-
-do_configure_prepend_htcdiamond() {
-       install -m 0644 arch/arm/configs/${MACHINE}_defconfig ${WORKDIR}/defconfig
-}