davinci: update DM3xx/DM6xxx and OMAPL1xx kernels

2 files changed, 49 insertions, 38 deletions

diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index b316e707e0..d4cacb9c44 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r29"
+MACHINE_KERNEL_PR = "r30"
 
 TARGET_ARCH = "arm"
 
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 54198093ee..48a9183a7e 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-DESCRIPTION = "Linux kernel for Davinci processors"
+DESCRIPTION = "Linux kernel for DaVinci processors"
 KERNEL_IMAGETYPE = "uImage"
 
 COMPATIBLE_MACHINE = "(dm355-evm|dm365-evm|dm6446-evm|dm6467-evm|dm6467t-evm|da830-omapl137-evm|da850-omapl138-evm|dm355-leopard|davinci-sffsdr|hawkboard)"
@@ -10,52 +10,63 @@ DEFAULT_PREFERENCE = "1"
 BRANCH = "master"
 SRC_URI = "file://defconfig "
 
-# dm355-evm/dm365-evm/dm6446-evm/dm6467-evm/dm6467t-evm Davinci PSP.03.01.00.28 (Phase 3 Build r28)
-SRCREV_dm355-evm           = "7b2683fd0168df1576fcea947ef9f63e905de807"
-SRCREV_dm365-evm           = "7b2683fd0168df1576fcea947ef9f63e905de807"
-SRCREV_dm6446-evm          = "7b2683fd0168df1576fcea947ef9f63e905de807"
-SRCREV_dm6467-evm          = "7b2683fd0168df1576fcea947ef9f63e905de807"
-SRCREV_dm6467t-evm         = "7b2683fd0168df1576fcea947ef9f63e905de807"
+S = "${WORKDIR}/git"
 
+# DaVinci DM3xx/DM6xxx
+# dm355-evm/dm365-evm/dm6446-evm/dm6467-evm/dm6467t-evm Davinci PSP 03.01.00/03.02.00 (build r30)
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
-PV_dm355-evm               = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}"
-PV_dm365-evm               = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}"
-PV_dm6446-evm              = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}"
-PV_dm6467-evm              = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}"
-PV_dm6467t-evm             = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}"
 
-BRANCH_dm355-evm           = "r28"
-BRANCH_dm365-evm           = "r28"
-BRANCH_dm6446-evm          = "r28"
-BRANCH_dm6467-evm          = "r28"
-BRANCH_dm6467t-evm         = "r28"
+ARAGO_DM_REV = "c2aeffe9e835c5b6b275edc416951ce4a348b0fd"
+ARAGO_DM_PV  = "2.6.31+2.6.32-rc2-${PR}+gitr${SRCREV}"
+ARAGO_DM_BR  = "r30"
+ARAGO_DM_URI = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git;branch=${BRANCH}"
 
-SRC_URI_append_dm355-evm          = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git;branch=${BRANCH}"
-SRC_URI_append_dm365-evm          = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git;branch=${BRANCH}"
-SRC_URI_append_dm6446-evm         = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git;branch=${BRANCH}"
-SRC_URI_append_dm6467-evm         = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git;branch=${BRANCH}"
-SRC_URI_append_dm6467t-evm        = "git://arago-project.org/git/projects/linux-davinci.git;protocol=git;branch=${BRANCH}"
+SRCREV_dm355-evm           = ${ARAGO_DM_REV}
+SRCREV_dm365-evm           = ${ARAGO_DM_REV}
+SRCREV_dm6446-evm          = ${ARAGO_DM_REV}
+SRCREV_dm6467-evm          = ${ARAGO_DM_REV}
+SRCREV_dm6467t-evm         = ${ARAGO_DM_REV}
 
+PV_dm355-evm               = ${ARAGO_DM_PV}
+PV_dm365-evm               = ${ARAGO_DM_PV}
+PV_dm6446-evm              = ${ARAGO_DM_PV}
+PV_dm6467-evm              = ${ARAGO_DM_PV}
+PV_dm6467t-evm             = ${ARAGO_DM_PV}
 
-# OMAPL
+BRANCH_dm355-evm           = ${ARAGO_DM_BR}
+BRANCH_dm365-evm           = ${ARAGO_DM_BR}
+BRANCH_dm6446-evm          = ${ARAGO_DM_BR}
+BRANCH_dm6467-evm          = ${ARAGO_DM_BR}
+BRANCH_dm6467t-evm         = ${ARAGO_DM_BR}
 
-# da830-omapl137-evm/da850-omapl138-evm/hawkboard OMAPL PSP.3.20.00.07 (Beta)
-SRCREV_da830-omapl137-evm  = "b306b47248ef6b4e5927a6baa2849ff434c12ddb"
-SRCREV_da850-omapl138-evm  = "b306b47248ef6b4e5927a6baa2849ff434c12ddb"
-SRCREV_hawkboard           = "b306b47248ef6b4e5927a6baa2849ff434c12ddb"
+SRC_URI_append_dm355-evm   = ${ARAGO_DM_URI}
+SRC_URI_append_dm365-evm   = ${ARAGO_DM_URI}
+SRC_URI_append_dm6446-evm  = ${ARAGO_DM_URI}
+SRC_URI_append_dm6467-evm  = ${ARAGO_DM_URI}
+SRC_URI_append_dm6467t-evm = ${ARAGO_DM_URI}
 
+# OMAPL1 DA8xx/L1xx
+# da830-omapl137-evm/da850-omapl138-evm/hawkboard OMAPL1 PSP 03.20.00.08 (Beta)
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
-PV_da830-omapl137-evm      = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}"
-PV_da850-omapl138-evm      = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}"
-PV_hawkboard               = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}"
 
-SRC_URI_append_da830-omapl137-evm = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH}"
-SRC_URI_append_da850-omapl138-evm = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH} \
-                                     file://logo_linux_clut224.ppm \
+ARAGO_L1_REV = "e3939e092ce59a6906bf8869a3c7d40314c02eef"
+ARAGO_L1_PV  = "2.6.31+2.6.32-rc6-${PR}+gitr${SRCREV}"
+ARAGO_L1_URI = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH}"
+
+SRCREV_da830-omapl137-evm         = ${ARAGO_L1_REV}
+SRCREV_da850-omapl138-evm         = ${ARAGO_L1_REV}
+SRCREV_hawkboard                  = ${ARAGO_L1_REV}
+
+PV_da830-omapl137-evm             = ${ARAGO_L1_PV}
+PV_da850-omapl138-evm             = ${ARAGO_L1_PV}
+PV_hawkboard                      = ${ARAGO_L1_PV}
+
+SRC_URI_append_da830-omapl137-evm = ${ARAGO_L1_URI}
+SRC_URI_append_da850-omapl138-evm = ${ARAGO_L1_URI}
+SRC_URI_append_hawkboard          = ${ARAGO_L1_URI}
+
+SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \
                                      file://da850_omapl138_opp456mhz.patch;patch=1"
-SRC_URI_append_hawkboard          = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH} \
-                                     file://logo_linux_clut224.ppm \
+SRC_URI_append_hawkboard          = "file://logo_linux_clut224.ppm \
                                      file://da850_omapl138_opp456mhz.patch;patch=1 \
                                      file://patch_hawk.diff;patch=1"
-
-S = "${WORKDIR}/git"