diff options
| author | Roger Monk <r-monk@ti.com> | 2010-03-10 23:41:04 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-04-12 19:43:23 +0200 |
| commit | 4dcd8faa836990423977be68e880176cd7155055 (patch) | |
| tree | 061144a3e4316d2395612ec7961194bb3c17d801 | |
| parent | f7cf756b00e0771519a4e6daf87d47ba948af147 (diff) | |
linux-davinci: Update da8xx/omaplxx to latest commits, remove merged patch
* 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>
| -rw-r--r-- | conf/machine/include/davinci.inc | 2 | ||||
| -rw-r--r-- | recipes/linux/linux-davinci/patch-2.6.33rc4-psp-to-fix-regulator.patch | 31 | ||||
| -rw-r--r-- | recipes/linux/linux-davinci_git.bb | 7 |
3 files changed, 4 insertions, 36 deletions
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 57475da3fc..59d763df69 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 = "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 index 3bd815ea9b..0000000000 --- a/recipes/linux/linux-davinci/patch-2.6.33rc4-psp-to-fix-regulator.patch +++ /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 - diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb index fac6916723..98e8c1967b 100644 --- a/recipes/linux/linux-davinci_git.bb +++ b/recipes/linux/linux-davinci_git.bb @@ -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 " |