diff options
| author |   Florian Boor <florian.boor@kernelconcepts.de> | 2009-07-01 12:46:47 +0200 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2009-07-01 12:49:39 +0200 |
| commit | 935f6044f699e8b4f803346a158b46cc79fb39da (patch) | |
| tree | e4112a291b12d4ca3cf7ecddb1bcf1a769b22683 /recipes/linux | |
| parent | a2ba9341af9cbb19593f120b52dee81788f03b9c (diff) | |
| download | openembedded-935f6044f699e8b4f803346a158b46cc79fb39da.tar.gz | |
linux: Merge tx25 support into the correct recipe.
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig (renamed from recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch (renamed from recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff (renamed from recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.29+2.6.30-rc4.bb | 6 |
4 files changed, 5 insertions, 1 deletions
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig index 290f8df24c..290f8df24c 100644 --- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch index b030555df6..b030555df6 100644 --- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff index 17765b46f6..17765b46f6 100644 --- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb index 3c79c45a64..8a6599553c 100644 --- a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb +++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb @@ -18,10 +18,11 @@ DEFAULT_PREFERENCE_poodle = "-1" DEFAULT_PREFERENCE_spitz = "-1" DEFAULT_PREFERENCE_tosa = "-1" DEFAULT_PREFERENCE_afeb9260 = "1" +DEFAULT_PREFERENCE_tx25 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.30/patch-${KERNEL_RELEASE}.bz2;patch=1 \ file://defconfig" SRC_URI_append_afeb9260 = " \ @@ -30,3 +31,6 @@ SRC_URI_append_afeb9260 = " \ file://0004-AFEB9260-ASoC-driver.patch;patch=1 \ " +SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch;patch=1 \ + file://linux-2.6.30-rc4-karo.diff;patch=1" + |