linux-davinci: Update da8xx/omaplxx to latest commits, remove merged patch
authorRoger Monk <r-monk@ti.com>
Wed, 10 Mar 2010 23:41:04 +0000 (23:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 12 Apr 2010 17:43:23 +0000 (19:43 +0200)
   * Update to head of tree to pick up USB/SATA fixes
   * Remove merged patch
   * Switch git source repo from /people to /projects
   * Bump KERNEL_PR

Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>
conf/machine/include/davinci.inc
recipes/linux/linux-davinci/patch-2.6.33rc4-psp-to-fix-regulator.patch [deleted file]
recipes/linux/linux-davinci_git.bb

index 57475da..59d763d 100644 (file)
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r43"
+MACHINE_KERNEL_PR = "r44"
 
 TARGET_ARCH = "arm"
 
diff --git a/recipes/linux/linux-davinci/patch-2.6.33rc4-psp-to-fix-regulator.patch b/recipes/linux/linux-davinci/patch-2.6.33rc4-psp-to-fix-regulator.patch
deleted file mode 100644 (file)
index 3bd815e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9e5c1f4e20dfb57eaa0140dc94ff531511e9617f Mon Sep 17 00:00:00 2001
-From: Roger Monk <r-monk@ti.com>
-Date: Tue, 2 Mar 2010 14:00:25 +0000
-Subject: [PATCH] da850 regulator: Protect function prototypes with CONFIG
-
-   * Regulator usage functions are encapsulated in CONFIG_REGULATOR
-   * Function prototypes need the same protection
-
-Signed-off-by: Roger Monk <r-monk@ti.com>
----
- arch/arm/mach-davinci/da850.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
-index 65e8a26..cfecd3c 100755
---- a/arch/arm/mach-davinci/da850.c
-+++ b/arch/arm/mach-davinci/da850.c
-@@ -1126,8 +1126,10 @@ static struct cpufreq_frequency_table da850_freq_table[] = {
-       },
- };
-+#ifdef CONFIG_REGULATOR
- static int da850_set_voltage(unsigned int index);
- static int da850_regulator_init(void);
-+#endif
- static struct davinci_cpufreq_config cpufreq_info = {
-       .freq_table = &da850_freq_table[0],
--- 
-1.6.0.6
-
index fac6916..98e8c19 100644 (file)
@@ -46,10 +46,10 @@ SRC_URI_append_dm6467  = ${ARAGO_DM_URI}
 
 # OMAPL tracking master branch
 
-ARAGO_L1_REV = "79903eb1d3a98b241530306b03edd28d7fa91ddd"
+ARAGO_L1_REV = "76fcecb83d562608bcebba44774f92b6c62d3593"
 ARAGO_L1_BR  = "master"
 ARAGO_L1_PV  = "2.6.32+2.6.33-rc4-${PR}+gitr${SRCREV}"
-ARAGO_L1_URI = "git://arago-project.org/git/people/sekhar/linux-omapl1.git;protocol=git;branch=${BRANCH} "
+ARAGO_L1_URI = "git://arago-project.org/git/projects/linux-omapl1.git;protocol=git;branch=${BRANCH} "
 
 SRCREV_da830-omapl137-evm         = ${ARAGO_L1_REV}
 SRCREV_da850-omapl138-evm         = ${ARAGO_L1_REV}
@@ -68,8 +68,7 @@ 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://patch-2.6.33rc4-psp-to-fix-regulator.patch;patch=1 "
+                                     "
 
 SRC_URI_append_hawkboard          = "file://logo_linux_clut224.ppm \
-                                     file://patch-2.6.33rc4-psp-to-fix-regulator.patch;patch=1 \
                                      file://patch-2.6.33rc4-psp-to-hawkboard.patch;patch=1 "