Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1231 - trunk/oe/packages/tasks ([EMAIL PROTECTED])
2. r1232 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r1233 - trunk/src/target/kernel/patches ([EMAIL PROTECTED])
4. r1234 - trunk/oe/packages/uboot ([EMAIL PROTECTED])
5. r1235 - developers/werner ([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-03-03 14:21:30 +0100 (Sat, 03 Mar 2007)
New Revision: 1231
Modified:
trunk/oe/packages/tasks/task-openmoko.bb
Log:
add base-files-doc to make sure /usr/share/common-licenses is populated
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-03-03 00:49:29 UTC (rev
1230)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-03-03 13:21:30 UTC (rev
1231)
@@ -31,6 +31,7 @@
RDEPENDS_task-openmoko-linux = "\
task-base \
base-files \
+ base-files-doc \
base-passwd \
busybox \
dropbear \
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-03 15:41:30 +0100 (Sat, 03 Mar 2007)
New Revision: 1232
Modified:
trunk/src/target/kernel/patches/gta01-power_control.patch
Log:
* the gsm 'download' pin is only present in GTA01v4 and GTA01Bv2, so only
export in sysfs on
those revisions
* add a description on the empty suspend/resume functions
Modified: trunk/src/target/kernel/patches/gta01-power_control.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-power_control.patch 2007-03-03
13:21:30 UTC (rev 1231)
+++ trunk/src/target/kernel/patches/gta01-power_control.patch 2007-03-03
14:41:30 UTC (rev 1232)
@@ -1,17 +1,17 @@
-Index: linux-2.6.20/arch/arm/common/Makefile
+Index: linux-2.6.20.1/arch/arm/common/Makefile
===================================================================
---- linux-2.6.20.orig/arch/arm/common/Makefile 2007-02-04 19:44:54.000000000
+0100
-+++ linux-2.6.20/arch/arm/common/Makefile 2007-02-15 15:05:53.000000000
+0100
+--- linux-2.6.20.1.orig/arch/arm/common/Makefile 2007-03-02
20:53:59.000000000 +0100
++++ linux-2.6.20.1/arch/arm/common/Makefile 2007-03-02 20:54:56.000000000
+0100
@@ -17,3 +17,5 @@
obj-$(CONFIG_SHARP_SCOOP) += scoop.o
obj-$(CONFIG_ARCH_IXP2000) += uengine.o
obj-$(CONFIG_ARCH_IXP23XX) += uengine.o
+#obj-$(CONFIG_MACH_GTA01) += gta01_pm_gsm.o gta01_pm_gps.o gta01_pm_bt.o
+obj-m += gta01_pm_gsm.o gta01_pm_gps.o
gta01_pm_bt.o
-Index: linux-2.6.20/arch/arm/common/gta01_pm_gps.c
+Index: linux-2.6.20.1/arch/arm/common/gta01_pm_gps.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/arch/arm/common/gta01_pm_gps.c 2007-02-15
15:17:52.000000000 +0100
++++ linux-2.6.20.1/arch/arm/common/gta01_pm_gps.c 2007-03-02
20:54:56.000000000 +0100
@@ -0,0 +1,542 @@
+/*
+ * GPS Power Management code for the FIC Neo1973 GSM Phone
@@ -555,11 +555,11 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GPS Power Management");
-Index: linux-2.6.20/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6.20.1/arch/arm/common/gta01_pm_gsm.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/arch/arm/common/gta01_pm_gsm.c 2007-02-15
15:16:48.000000000 +0100
-@@ -0,0 +1,164 @@
++++ linux-2.6.20.1/arch/arm/common/gta01_pm_gsm.c 2007-03-03
15:39:15.000000000 +0100
+@@ -0,0 +1,174 @@
+/*
+ * GSM Management code for the FIC Neo1973 GSM Phone
+ *
@@ -645,20 +645,22 @@
+#ifdef CONFIG_PM
+static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
+{
-+ /* FIXME */
++ /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
++ * don't need to do anything here */
+
+ return 0;
+}
+
+static int gta01_gsm_resume(struct platform_device *pdev)
+{
-+ /* FIXME */
++ /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
++ * don't need to do anything here */
+
+ return 0;
+}
+#else
+#define gta01_gsm_suspend NULL
-+#define gta01_gsm_resume NULL
++#define gta01_gsm_resume NULL
+#endif
+
+static int __init gta01_gsm_probe(struct platform_device *pdev)
@@ -684,8 +686,16 @@
+
+ device_create_file(&pdev->dev, &dev_attr_power_on);
+ device_create_file(&pdev->dev, &dev_attr_reset);
-+ device_create_file(&pdev->dev, &dev_attr_download);
+
++ switch (system_rev) {
++ case GTA01v4_SYSTEM_REV:
++ case GTA01Bv2_SYSTEM_REV:
++ device_create_file(&pdev->dev, &dev_attr_download);
++ break;
++ default:
++ break;
++ }
++
+ return 0;
+}
+
@@ -724,10 +734,10 @@
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GSM Management");
-Index: linux-2.6.20/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6.20.1/arch/arm/common/gta01_pm_bt.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/arch/arm/common/gta01_pm_bt.c 2007-02-15 15:17:38.000000000
+0100
++++ linux-2.6.20.1/arch/arm/common/gta01_pm_bt.c 2007-03-02
20:54:56.000000000 +0100
@@ -0,0 +1,133 @@
+/*
+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-03 20:06:13 +0100 (Sat, 03 Mar 2007)
New Revision: 1233
Modified:
trunk/src/target/kernel/patches/gta01-backlight.patch
Log:
drivers/video/backlight/gta01_bl.c (gta01bl_init_hw): removed mysterious
initialization sequence
drivers/video/backlight/gta01_bl.c (gta01bl_init_hw): reordered TC??B vs. TCON
according to manual (page 10-5)
Modified: trunk/src/target/kernel/patches/gta01-backlight.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-backlight.patch 2007-03-03
14:41:30 UTC (rev 1232)
+++ trunk/src/target/kernel/patches/gta01-backlight.patch 2007-03-03
19:06:13 UTC (rev 1233)
@@ -158,7 +158,7 @@
+ __raw_writel(tcfg1, S3C2410_TCFG1);
+ __raw_writel(tcfg0, S3C2410_TCFG0);
+
-+#if 1
++#if 0
+ __raw_writel(tcnt, S3C2410_TCNTB(0));
+ __raw_writel(tcon, S3C2410_TCON);
+ __raw_writel(tcnt, S3C2410_TCNTB(0));
@@ -170,9 +170,9 @@
+ tcon |= S3C2410_TCON_T0RELOAD;
+ tcon |= S3C2410_TCON_T0MANUALUPD;
+
-+ __raw_writel(tcon, S3C2410_TCON);
+ __raw_writel(tcnt, S3C2410_TCNTB(0));
+ __raw_writel(tcnt, S3C2410_TCMPB(0));
++ __raw_writel(tcon, S3C2410_TCON);
+
+ /* start the timer */
+ tcon |= S3C2410_TCON_T0START;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-04 01:15:51 +0100 (Sun, 04 Mar 2007)
New Revision: 1234
Modified:
trunk/oe/packages/uboot/uboot-gta01_svn.bb
Log:
Fix ordering of do_deploy in uboot to be compatible with rm_work (Closees:
#225)
Modified: trunk/oe/packages/uboot/uboot-gta01_svn.bb
===================================================================
--- trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-03-03 19:06:13 UTC (rev
1233)
+++ trunk/oe/packages/uboot/uboot-gta01_svn.bb 2007-03-04 00:15:51 UTC (rev
1234)
@@ -46,5 +46,5 @@
}
do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
addtask quilt before do_patch after do_unpack
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-04 08:31:31 +0100 (Sun, 04 Mar 2007)
New Revision: 1235
Added:
developers/werner/dfu-util-alt-by-name.patch
Log:
Add Altsetting lookup by name to dfu-util. (Proposed patch.)
main.c: removed PAGE_SIZE comment
main.c (help): fixed "Altseting" typo
main.c (main, help, alt_by_name): added lookup of dif->altsetting by name
Added: developers/werner/dfu-util-alt-by-name.patch
===================================================================
--- developers/werner/dfu-util-alt-by-name.patch 2007-03-04 00:15:51 UTC
(rev 1234)
+++ developers/werner/dfu-util-alt-by-name.patch 2007-03-04 07:31:31 UTC
(rev 1235)
@@ -0,0 +1,104 @@
+main.c: removed PAGE_SIZE comment
+main.c (help): fixed "Altseting" typo
+main.c (main, help, alt_by_name): added lookup of dif->altsetting by name
+
+Index: dfu-util/src/main.c
+===================================================================
+--- dfu-util/src/main.c (revision 1234)
++++ dfu-util/src/main.c (working copy)
+@@ -32,7 +32,6 @@
+ #include "sam7dfu.h"
+ //#include "config.h"
+
+-/* FIXME: how do we learn about PAGE_SIZE in userspace? */
+
+ int debug;
+ static int verbose = 0;
+@@ -153,6 +152,33 @@
+ return 0;
+ }
+
++static int alt_by_name(struct dfu_if *dfu_if, void *v)
++{
++ struct usb_device *dev = dfu_if->dev;
++ int if_name_str_idx;
++ char name[MAX_STR_LEN+1] = "UNDEFINED";
++
++ if_name_str_idx =
++ dev->config[dfu_if->configuration].interface[dfu_if->interface].
++ altsetting[dfu_if->altsetting].iInterface;
++ if (!if_name_str_idx)
++ return 0;
++ if (!dfu_if->dev_handle)
++ dfu_if->dev_handle = usb_open(dfu_if->dev);
++ if (!dfu_if->dev_handle)
++ return 0;
++ if (usb_get_string_simple(dfu_if->dev_handle, if_name_str_idx, name,
++ MAX_STR_LEN) < 0)
++ return 0; /* should we return an error here ? */
++ if (strcmp(name, v))
++ return 0;
++ /*
++ * Return altsetting+1 so that we can use return value 0 to indicate
++ * "not found".
++ */
++ return dfu_if->altsetting+1;
++}
++
+ static int _count_cb(struct dfu_if *dif, void *v)
+ {
+ int *count = v;
+@@ -264,7 +290,8 @@
+ " -d --device vendor:product\tSpecify Vendor/Product ID of DFU
device\n"
+ " -c --cfg config_nr\t\tSpecify the Configuration of DFU
device\n"
+ " -i --intf intf_nr\t\tSpecify the DFU Interface number\n"
+- " -a --alt alt_nr\t\tSpecify the Altseting of the DFU
Interface\n"
++ " -a --alt alt\t\t\tSpecify the Altsetting of the DFU
Interface\n"
++ "\t\t\t\tby name or by number\n"
+ " -t --transfer-size\t\tSpecify the number of bytes per USB
Transfer\n"
+ " -U --upload file\t\tRead firmware from device into <file>\n"
+ " -D --download file\t\tWrite firmware from <file> into
device\n"
+@@ -307,6 +334,8 @@
+ struct dfu_status status;
+ struct usb_dfu_func_descriptor func_dfu;
+ char *filename = NULL;
++ char *alt_name = NULL; /* query alt name if non-NULL */
++ char *end;
+ int final_reset = 0;
+ int page_size = getpagesize();
+ int ret;
+@@ -364,7 +393,9 @@
+ break;
+ case 'a':
+ /* Interface Alternate Setting */
+- dif->altsetting = atoi(optarg);
++ dif->altsetting = strtoul(optarg, &end, 0);
++ if (*end)
++ alt_name = optarg;
+ dif->flags |= DFU_IFF_ALT;
+ break;
+ case 't':
+@@ -540,6 +571,23 @@
+ exit(1);
+ }
+
++ if (alt_name) {
++ int n;
++
++ n = find_dfu_if(dif->dev, &alt_by_name, alt_name);
++ if (!n) {
++ fprintf(stderr, "No such Alternate Setting: \"%s\"\n",
++ alt_name);
++ exit(1);
++ }
++ if (n < 0) {
++ fprintf(stderr, "Error %d in name lookup\n", n);
++ exit(1);
++ }
++ dif->altsetting = n-1;
++ printf("Looked up \"%s\" = %d\n", alt_name, dif->altsetting);
++ }
++
+ printf("Setting Alternate Setting ...\n");
+ if (usb_set_altinterface(dif->dev_handle, dif->altsetting) < 0) {
+ fprintf(stderr, "Cannot set alternate interface: %s\n",
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
