[oe-commits] org.oe.dev merge of '11dbe81fa9fbb8336ab11a65894765c226768d3f'

[oe commit]

merge of '11dbe81fa9fbb8336ab11a65894765c226768d3f'
     and '76a8d4eeb5f5753a51ba8c050c4097569a70d5d7'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 92292c95570e7e9726cb59c43fba57b359eba5c2
ViewMTN: http://monotone.openembedded.org/revision/info/92292c95570e7e9726cb59c43fba57b359eba5c2
Files:
1
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/linux/linux-ezx-2.6.21/patches/mtdfix.patch
packages/linux/linux-ezx_2.6.21.bb
Diffs:

#
# mt diff -r11dbe81fa9fbb8336ab11a65894765c226768d3f -r92292c95570e7e9726cb59c43fba57b359eba5c2
#
# 
# 
# patch "packages/gsm/files/default"
#  from [d11d3c89b215d54d2e182754e1343c9a2fb716d2]
#    to [17a638c1cc8871a48e1059c2c096b6c8a9d148fe]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [367a54f8a664bfa37b00160037aa16f940344d46]
#    to [f586a1fade3bbd50750ea77934c2b6ecff0ebad5]
# 
============================================================
--- packages/gsm/files/default	d11d3c89b215d54d2e182754e1343c9a2fb716d2
+++ packages/gsm/files/default	17a638c1cc8871a48e1059c2c096b6c8a9d148fe
@@ -29,6 +29,10 @@ case `cpuinfo_id` in
 		GSMD_OPTS="-s 460800 -F -w 1"
 		GSM_DEV="/dev/ttyS0"
 		;;
+        "Motorola Ezx Platform")
+                GSMD_OPTS="-s 115200 -F"
+                GSM_DEV="/dev/mux1"
+                ;;
 	*)
 		# Unknown board
 
============================================================
--- packages/gsm/libgsmd_svn.bb	367a54f8a664bfa37b00160037aa16f940344d46
+++ packages/gsm/libgsmd_svn.bb	f586a1fade3bbd50750ea77934c2b6ecff0ebad5
@@ -1,10 +1,10 @@ PV = "0.1+svnr${SRCREV}"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svnr${SRCREV}"
-PR = "r23"
+PR = "r24"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \


#
# mt diff -r76a8d4eeb5f5753a51ba8c050c4097569a70d5d7 -r92292c95570e7e9726cb59c43fba57b359eba5c2
#
# 
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/mtdfix.patch"
#  content [4999f0af3186f5d8ef8c3d3abd2273375fae298e]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [25929ca7d083286d0d3b6c4f0dd7901ec2d82d90]
#    to [5d1ec4b9844eed9888871827926c283e7ba4f98c]
# 
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/mtdfix.patch	4999f0af3186f5d8ef8c3d3abd2273375fae298e
+++ packages/linux/linux-ezx-2.6.21/patches/mtdfix.patch	4999f0af3186f5d8ef8c3d3abd2273375fae298e
@@ -0,0 +1,41 @@
+--- /tmp/cacheflush.h	2007-09-10 15:22:58.188856413 +0200
++++ linux-2.6.21/include/asm-arm/cacheflush.h	2007-09-10 15:23:14.009757994 +0200
+@@ -418,6 +418,14 @@
+  */
+ #define flush_icache_page(vma,page)	do { } while (0)
+ 
++inline static void flush_ioremap_region(unsigned long phys, void __iomem *virt,
++                                        unsigned offset, size_t size)
++{
++       const void *start = virt + offset;
++       dmac_inv_range(start, start + size);
++}
++
++
+ #define __cacheid_present(val)		(val != read_cpuid(CPUID_ID))
+ #define __cacheid_vivt(val)		((val & (15 << 25)) != (14 << 25))
+ #define __cacheid_vipt(val)		((val & (15 << 25)) == (14 << 25))
+--- /tmp/ezx-flash.c	2007-09-10 15:22:58.192856640 +0200
++++ linux-2.6.21/drivers/mtd/maps/ezx-flash.c	2007-09-10 15:23:24.878377362 +0200
+@@ -21,6 +21,8 @@
+ #include <linux/dma-mapping.h>
+ #include <linux/slab.h>
+ 
++#include <asm/cacheflush.h>
++
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/map.h>
+ #include <linux/mtd/partitions.h>
+@@ -51,11 +53,10 @@
+ 		"sub pc, pc #4"
+ 		:"=r"(j));
+ #else
+-	consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE);
++        flush_ioremap_region(map->phys, map->cached, from, len);
+ #endif
+ }
+ 
+-
+ struct map_info pxa27x_map = {
+ 	.name		= "PXA27x flash",
+ 	.size		= WINDOW_SIZE,
============================================================
--- packages/linux/linux-ezx_2.6.21.bb	25929ca7d083286d0d3b6c4f0dd7901ec2d82d90
+++ packages/linux/linux-ezx_2.6.21.bb	5d1ec4b9844eed9888871827926c283e7ba4f98c
@@ -1,10 +1,10 @@ EZX = "ezxdev"
 DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
 SECTION = "kernel"
 AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel at lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 LICENSE = "GPL"
 EZX = "ezxdev"
-PR = "${EZX}-r10"
+PR = "${EZX}-r11"
 
 inherit kernel
 
@@ -58,6 +58,7 @@ SRC_URI = " \
         file://patches/asoc-pxa-ssp.patch;patch=1 \
         file://patches/asoc-fix-loopback.patch;patch=1 \
         file://patches/ezx-asoc.patch;patch=1 \     
+        file://patches/mtdfix.patch;patch=1 \
         file://defconfig \
         \
 	"