[oe-commits] org.oe.dev merge of '57d7542ed0fd0b8b1f119cea4a56f425d875a4a0'

jluebbe commit openembedded-commits at lists.openembedded.org
Tue Sep 25 19:21:38 UTC 2007 

merge of '57d7542ed0fd0b8b1f119cea4a56f425d875a4a0'
     and '881b243754238663caa684adaf1bfed923a1d0e6'

Author: jluebbe at openembedded.org
Branch: org.openembedded.dev
Revision: 832e94cf57bee3a8389ed49474b96e73fc918e17
ViewMTN: http://monotone.openembedded.org/revision/info/832e94cf57bee3a8389ed49474b96e73fc918e17
Files:
1
packages/openmoko-base/openmoko-sound-system/session
packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/a780/defconfig
packages/linux/linux-ezx-2.6.21/e680/defconfig
packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch
packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/index.html
packages/linux/linux-ezx-2.6.21/patches/series
packages/linux/linux-ezx-2.6.21/rokre2/defconfig
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
Diffs:

#
# mt diff -r57d7542ed0fd0b8b1f119cea4a56f425d875a4a0 -r832e94cf57bee3a8389ed49474b96e73fc918e17
#
# 
# 
# patch "packages/openmoko-base/openmoko-sound-system/session"
#  from [440f08023fd2111ebd3ab7b3914fba30c36e0d59]
#    to [963e0a668b32334f079f421e73b9a68bc5a9cfc5]
# 
# patch "packages/openmoko-base/openmoko-sound-theme-standard_svn.bb"
#  from [cc26de0759df303d921d485edb20c50d06019574]
#    to [a319673fe5c21c3091c0f493e4efe675d2767181]
# 
============================================================
--- packages/openmoko-base/openmoko-sound-system/session	440f08023fd2111ebd3ab7b3914fba30c36e0d59
+++ packages/openmoko-base/openmoko-sound-system/session	963e0a668b32334f079f421e73b9a68bc5a9cfc5
@@ -22,7 +22,7 @@ load-module module-x11-bell sample=x11-b
 load-module module-x11-bell sample=x11-bell
 
 # Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
 load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
 load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
 
============================================================
--- packages/openmoko-base/openmoko-sound-theme-standard_svn.bb	cc26de0759df303d921d485edb20c50d06019574
+++ packages/openmoko-base/openmoko-sound-theme-standard_svn.bb	a319673fe5c21c3091c0f493e4efe675d2767181
@@ -1,7 +1,7 @@ PV = "0.1+svnr${SRCREV}"
 DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 PV = "0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko-base autotools
 
@@ -14,7 +14,7 @@ do_install() {
         for i in *.mp3; do
                 cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
-        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
                 cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
 }


#
# mt diff -r881b243754238663caa684adaf1bfed923a1d0e6 -r832e94cf57bee3a8389ed49474b96e73fc918e17
#
# 
# 
# patch "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
#  from [fddca45c3c4d0ac194de7c1de4883a7324bc04b7]
#    to [086281268594cbfbf358e17376c3626655243110]
# 
# patch "packages/linux/linux-ezx-2.6.21/a780/defconfig"
#  from [f9631dffecc5e6e24b6e67894d393c7a2bd167cf]
#    to [ccfe1abde7108b76e389f31d17872205bc396854]
# 
# patch "packages/linux/linux-ezx-2.6.21/e680/defconfig"
#  from [1e0f6498297163b913bae9ecf566efb3c9aea5f0]
#    to [53921a47c1e9537d355d805d0774360c2862914d]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch"
#  from [f76cfad1cf632fbdccf9e774251130df373d9e1c]
#    to [23493ab72c962971dc2820f71387c67907d18485]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch"
#  from [8ccf6439d54d53fbffa4fc7d13ada938f1c9bbfc]
#    to [da85882284fa91ea1031ac8fb4b7e91bc3b1626e]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch"
#  from [dc00c58df5f70ebeb53fd7a8983874cfd1802187]
#    to [43545df8e0d10274e173e53ca52fb6f1f43ee727]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch"
#  from [5ea57d6607f060b9fbee31cf4214bbe0fd8b1329]
#    to [e4fd70c82cfed04dbfdef03441a31a7159b8f3ed]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch"
#  from [0f9cc6315d859bc506bd8e94753ef7a2c8065044]
#    to [0bf23aee957b7db309237d22dbf48e0c92272d63]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch"
#  from [57b7f73511468ddffaba28b95d19ed84d5a2eb8a]
#    to [d49921434c71dde2c9596a8cec4ed7e75af33e14]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch"
#  from [abdddce8584aa8035eeacc9956b7a3c28e066379]
#    to [5d81781ea51fd3740b3279b86ab634d2e3b4ab39]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch"
#  from [6e82f1f852bda74b86e74926f3f99bf90d00a041]
#    to [c62091191d3a6035a3ddc58a2efe74fda0b909ef]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/index.html"
#  from [d69eb69c21a746109581d807596c32a688aad0fa]
#    to [7e7e0f6738946095b392fe9a239fc40b2dc56909]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/series"
#  from [e0ee47911741d71f5de5441dd40ff435eda64fa7]
#    to [1d0a765330a7a742ba24cff04dfe966ba3f2649f]
# 
# patch "packages/linux/linux-ezx-2.6.21/rokre2/defconfig"
#  from [4b2bc0b55902873aa715c922fe96fa852919c359]
#    to [0ad592aa14c8f500972e0fc891bd12e7aadbc10a]
# 
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
#  from [8da1a6604826ab49b5cc93a4a419b9f35ad201b6]
#    to [65d53b2611eeceb971297b1ff01cf1996b72f47c]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [5cd726a272b15df1119bf3c7f55ea7b2cdf6403c]
#    to [eb31269e5b23d7d27da1cca934cbec96a1ca3234]
# 
============================================================
--- packages/linux/linux-ezx-2.6.21/a1200/defconfig	fddca45c3c4d0ac194de7c1de4883a7324bc04b7
+++ packages/linux/linux-ezx-2.6.21/a1200/defconfig	086281268594cbfbf358e17376c3626655243110
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1313,12 +1313,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
============================================================
--- packages/linux/linux-ezx-2.6.21/a780/defconfig	f9631dffecc5e6e24b6e67894d393c7a2bd167cf
+++ packages/linux/linux-ezx-2.6.21/a780/defconfig	ccfe1abde7108b76e389f31d17872205bc396854
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1317,12 +1317,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
============================================================
--- packages/linux/linux-ezx-2.6.21/e680/defconfig	1e0f6498297163b913bae9ecf566efb3c9aea5f0
+++ packages/linux/linux-ezx-2.6.21/e680/defconfig	53921a47c1e9537d355d805d0774360c2862914d
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1311,12 +1311,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=n
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch	f76cfad1cf632fbdccf9e774251130df373d9e1c
+++ packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch	23493ab72c962971dc2820f71387c67907d18485
@@ -1,73 +1,15 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:38:52.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:48:23.000000000 -0300
-@@ -25,6 +25,7 @@
- #include <asm/arch/mmc.h>
- 
- #include "generic.h"
-+#include "ezx-eoc.h"
- 
- extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
- extern void ezx_backlight_power(int);
-@@ -203,8 +204,65 @@
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-24 20:14:54.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-24 20:15:18.000000000 -0300
+@@ -203,8 +203,15 @@
  	},
  };
  
 +
-+/* EOC */
-+static const unsigned int tab_init_eoc_reg[][2] =
-+{
-+    {POWER_IC_REG_EOC_INT_MASK,        0x00000FEF},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_0, 0x00000C00},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_1, 0x0000000C},
-+    {POWER_IC_REG_EOC_CONN_CONTROL,    0x00021044},
-+};
-+
-+static void dump_eoc_registers(void)
-+{
-+	int i, val = 0;
-+
-+	printk("========DUMP EOC=========\n");
-+	for (i = 0; i < POWER_IC_REG_EOC_NUM; i++) {
-+		eoc_reg_read(i, &val);
-+		printk("eoc_registers[%d] = 0x%08X\n", i, val);
-+	}
-+	printk("========END DUMP=========\n");
-+}
-+
-+/*
-+ * FIXME: The same about the PCAP driver applies here.
-+ * This is the initial state only.
-+ * Which bits does the change to USB/UART/AUDIO mode?
-+ * I think that this is causing the crash on pxa27x-udc
-+ * you are setting the 'port connected' bit, and thats why
-+ * you are getting interrupts early.
-+ * --WM
-+ */
-+
-+static int __init a1200_eoc_init(void)
-+{
-+    int i;
-+
-+    for (i = 0; i < sizeof(tab_init_eoc_reg)/sizeof(unsigned int)/2; i++)
-+    {
-+		eoc_reg_write(tab_init_eoc_reg[i][0], tab_init_eoc_reg[i][1]);
-+    }
-+	dump_eoc_registers();
-+	return 0;
-+}
-+
-+static struct ezx_eoc_platform_data a1200_eoc_platform_data = {
-+	.init		= a1200_eoc_init,
-+};
-+
 +struct platform_device a1200_eoc_device = {
 +	.name		= "ezx-eoc",
 +	.id		= -1,
-+	.dev		= {
-+		.platform_data = &a1200_eoc_platform_data,
-+	},
 +};
 +
  static struct platform_device *devices[] __initdata = {
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch	8ccf6439d54d53fbffa4fc7d13ada938f1c9bbfc
+++ packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch	da85882284fa91ea1031ac8fb4b7e91bc3b1626e
@@ -1,7 +1,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-23 13:28:02.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-23 13:31:40.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:53.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:01:06.000000000 -0300
 @@ -16,6 +16,7 @@
  #include <linux/mmc/host.h>
  #include <linux/irq.h>
@@ -10,7 +10,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
-@@ -343,11 +344,34 @@
+@@ -292,11 +293,34 @@
  	.num_resources  = ARRAY_SIZE(pcap_ts_resources),
  	.resource       = pcap_ts_resources,
  };
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch	dc00c58df5f70ebeb53fd7a8983874cfd1802187
+++ packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch	43545df8e0d10274e173e53ca52fb6f1f43ee727
@@ -1,7 +1,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-23 11:48:10.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-23 13:24:58.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 00:03:01.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:40.000000000 -0300
 @@ -15,6 +15,7 @@
  #include <linux/fb.h>
  #include <linux/mmc/host.h>
@@ -10,14 +10,13 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
-@@ -23,12 +24,14 @@
+@@ -23,11 +24,13 @@
  #include <asm/arch/ezx.h>
  #include <asm/arch/ezx-pcap.h>
  #include <asm/arch/mmc.h>
 +#include <asm/arch/kbd.h>
  
  #include "generic.h"
- #include "ezx-eoc.h"
  
  extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
  extern void ezx_backlight_power(int);
@@ -25,8 +24,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
  
  #ifdef CONFIG_EZX_PCAP
  extern int ezx_pcap_mmcsd_power(int);
-@@ -284,6 +287,63 @@
- 	.resource       = pcap_ts_resources,
+@@ -209,6 +212,63 @@
+ 	.id		= -1,
  };
  
 +/* Keypad */
@@ -89,7 +88,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
  static struct platform_device *devices[] __initdata = {
  	&a1200_pcap_device,
  	&a1200_eoc_device,
-@@ -294,6 +354,7 @@
+@@ -218,6 +278,7 @@
  {
  	set_pxa_fb_info(&a1200_fb_info);
  	pxa_set_mci_info(&a1200_mci_platform_data);
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch	5ea57d6607f060b9fbee31cf4214bbe0fd8b1329
+++ packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch	e4fd70c82cfed04dbfdef03441a31a7159b8f3ed
@@ -1,11 +1,11 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:50:31.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:51:06.000000000 -0300
-@@ -260,9 +260,34 @@
- 	},
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:40.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:53.000000000 -0300
+@@ -269,9 +269,34 @@
  };
  
+ 
 +/* PCAP_TS */
 +struct resource pcap_ts_resources[] = {
 +	[0] = {
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch	0f9cc6315d859bc506bd8e94753ef7a2c8065044
+++ packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch	0bf23aee957b7db309237d22dbf48e0c92272d63
@@ -1,73 +1,15 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:38:52.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:49:42.000000000 -0300
-@@ -25,6 +25,7 @@
- #include <asm/arch/mmc.h>
- 
- #include "generic.h"
-+#include "ezx-eoc.h"
- 
- extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
- extern void ezx_backlight_power(int);
-@@ -203,8 +204,65 @@
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-24 20:14:54.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-24 20:15:18.000000000 -0300
+@@ -203,8 +203,15 @@
  	},
  };
  
 +
-+/* EOC */
-+static const unsigned int tab_init_eoc_reg[][2] =
-+{
-+    {POWER_IC_REG_EOC_INT_MASK,        0x00000FEF},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_0, 0x00000C00},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_1, 0x0000000C},
-+    {POWER_IC_REG_EOC_CONN_CONTROL,    0x00021044},
-+};
-+
-+static void dump_eoc_registers(void)
-+{
-+	int i, val = 0;
-+
-+	printk("========DUMP EOC=========\n");
-+	for (i = 0; i < POWER_IC_REG_EOC_NUM; i++) {
-+		eoc_reg_read(i, &val);
-+		printk("eoc_registers[%d] = 0x%08X\n", i, val);
-+	}
-+	printk("========END DUMP=========\n");
-+}
-+
-+/*
-+ * FIXME: The same about the PCAP driver applies here.
-+ * This is the initial state only.
-+ * Which bits does the change to USB/UART/AUDIO mode?
-+ * I think that this is causing the crash on pxa27x-udc
-+ * you are setting the 'port connected' bit, and thats why
-+ * you are getting interrupts early.
-+ * --WM
-+ */
-+
-+static int __init e6_eoc_init(void)
-+{
-+    int i;
-+
-+    for (i = 0; i < sizeof(tab_init_eoc_reg)/sizeof(unsigned int)/2; i++)
-+    {
-+		eoc_reg_write(tab_init_eoc_reg[i][0], tab_init_eoc_reg[i][1]);
-+    }
-+	dump_eoc_registers();
-+	return 0;
-+}
-+
-+static struct ezx_eoc_platform_data e6_eoc_platform_data = {
-+	.init		= e6_eoc_init,
-+};
-+
 +struct platform_device e6_eoc_device = {
 +	.name		= "ezx-eoc",
 +	.id		= -1,
-+	.dev		= {
-+		.platform_data = &e6_eoc_platform_data,
-+	},
 +};
 +
  static struct platform_device *devices[] __initdata = {
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch	57b7f73511468ddffaba28b95d19ed84d5a2eb8a
+++ packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch	d49921434c71dde2c9596a8cec4ed7e75af33e14
@@ -1,9 +1,9 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ez
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:50:31.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:51:40.000000000 -0300
-@@ -260,9 +260,34 @@
- 	},
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-25 00:03:01.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-25 02:00:58.000000000 -0300
+@@ -209,9 +209,34 @@
+ 	.id		= -1,
  };
  
 +/* PCAP_TS */
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch	abdddce8584aa8035eeacc9956b7a3c28e066379
+++ packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch	5d81781ea51fd3740b3279b86ab634d2e3b4ab39
@@ -1,7 +1,7 @@ Index: linux-2.6.21/arch/arm/boot/compre
 Index: linux-2.6.21/arch/arm/boot/compressed/head-xscale.S
 ===================================================================
---- linux-2.6.21.orig/arch/arm/boot/compressed/head-xscale.S	2007-09-23 11:16:58.000000000 -0300
-+++ linux-2.6.21/arch/arm/boot/compressed/head-xscale.S	2007-09-23 11:17:06.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/boot/compressed/head-xscale.S	2007-09-23 13:27:06.000000000 -0300
++++ linux-2.6.21/arch/arm/boot/compressed/head-xscale.S	2007-09-23 13:27:19.000000000 -0300
 @@ -53,3 +53,6 @@
  		str	r1, [r0, #0x18]
  #endif
@@ -11,8 +11,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Kc
 +#endif
 Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig	2007-09-23 11:16:58.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/Kconfig	2007-09-23 11:18:47.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig	2007-09-23 13:27:06.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/Kconfig	2007-09-23 13:27:19%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list