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. r1220 - trunk/src/host/devirginator ([EMAIL PROTECTED])
2. r1221 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r1222 - trunk/src/target/kernel/patches ([EMAIL PROTECTED])
4. r1223 - trunk/oe/packages/linux/linux-gta01
([EMAIL PROTECTED])
5. r1224 - trunk/oe/conf/machine ([EMAIL PROTECTED])
6. r1225 - trunk/src/host/devirginator ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2007-03-02 17:35:58 +0100 (Fri, 02 Mar 2007)
New Revision: 1220
Modified:
trunk/src/host/devirginator/openocdcmd.pl
Log:
openocdcmd.pl: ignore errors from closing the pipe, because telnet reports
remote close as an error
Modified: trunk/src/host/devirginator/openocdcmd.pl
===================================================================
--- trunk/src/host/devirginator/openocdcmd.pl 2007-03-02 16:32:47 UTC (rev
1219)
+++ trunk/src/host/devirginator/openocdcmd.pl 2007-03-02 16:35:58 UTC (rev
1220)
@@ -56,4 +56,4 @@
exit(1);
}
-close PIPE || die "telnet: $!";
+close PIPE;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-02 18:47:53 +0100 (Fri, 02 Mar 2007)
New Revision: 1221
Modified:
trunk/src/target/kernel/patches/gta01-core.patch
trunk/src/target/kernel/patches/gta01-pcf50606.patch
Log:
* move 'gta01-pm-gps' and 'gta01-pm-bt' to the pcf50606 driver, where
they can be put into the correct place in the device tree for suspend/resume
* declare them as static in that process
Modified: trunk/src/target/kernel/patches/gta01-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-core.patch 2007-03-02 16:35:58 UTC
(rev 1220)
+++ trunk/src/target/kernel/patches/gta01-core.patch 2007-03-02 17:47:53 UTC
(rev 1221)
@@ -1,10 +1,10 @@
This patch adds support for the FIC GTA01 machine type to the ARM port of
the linux kernel.
-Index: linux-2.6.20/arch/arm/mach-s3c2410/Kconfig
+Index: linux-2.6.20.1/arch/arm/mach-s3c2410/Kconfig
===================================================================
---- linux-2.6.20.orig/arch/arm/mach-s3c2410/Kconfig 2007-02-20
18:43:31.000000000 +0100
-+++ linux-2.6.20/arch/arm/mach-s3c2410/Kconfig 2007-02-20 18:56:10.000000000
+0100
+--- linux-2.6.20.1.orig/arch/arm/mach-s3c2410/Kconfig 2007-03-02
18:23:34.000000000 +0100
++++ linux-2.6.20.1/arch/arm/mach-s3c2410/Kconfig 2007-03-02
18:39:51.000000000 +0100
@@ -86,6 +86,14 @@
help
Say Y here if you are using the Armzone QT2410
@@ -20,10 +20,10 @@
config ARCH_S3C2440
bool "SMDK2440"
select CPU_S3C2440
-Index: linux-2.6.20/arch/arm/mach-s3c2410/Makefile
+Index: linux-2.6.20.1/arch/arm/mach-s3c2410/Makefile
===================================================================
---- linux-2.6.20.orig/arch/arm/mach-s3c2410/Makefile 2007-02-20
18:43:31.000000000 +0100
-+++ linux-2.6.20/arch/arm/mach-s3c2410/Makefile 2007-02-20
18:43:31.000000000 +0100
+--- linux-2.6.20.1.orig/arch/arm/mach-s3c2410/Makefile 2007-03-02
18:23:34.000000000 +0100
++++ linux-2.6.20.1/arch/arm/mach-s3c2410/Makefile 2007-03-02
18:39:51.000000000 +0100
@@ -89,5 +89,6 @@
obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
obj-$(CONFIG_MACH_VSTMS) += mach-vstms.o
@@ -31,11 +31,11 @@
+obj-$(CONFIG_MACH_GTA01) += mach-gta01.o
obj-$(CONFIG_MACH_SMDK) += common-smdk.o
-Index: linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c
+Index: linux-2.6.20.1/arch/arm/mach-s3c2410/mach-gta01.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/arch/arm/mach-s3c2410/mach-gta01.c 2007-02-20
18:57:42.000000000 +0100
-@@ -0,0 +1,520 @@
++++ linux-2.6.20.1/arch/arm/mach-s3c2410/mach-gta01.c 2007-03-02
18:40:31.000000000 +0100
+@@ -0,0 +1,506 @@
+/*
+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
+ *
@@ -473,18 +473,10 @@
+ .resource = gta01_button_resources,
+};
+
-+struct platform_device gta01_pm_gsm_dev = {
++static struct platform_device gta01_pm_gsm_dev = {
+ .name ="gta01-pm-gsm",
+};
+
-+struct platform_device gta01_pm_gps_dev = {
-+ .name ="gta01-pm-gps",
-+};
-+
-+struct platform_device gta01_pm_bt_dev = {
-+ .name ="gta01-pm-bt",
-+};
-+
+/* USB */
+static struct s3c2410_hcd_info gta01_usb_info = {
+ .port[0] = {
@@ -535,14 +527,8 @@
+ platform_device_register(>a01_bl_dev);
+ platform_device_register(>a01_button_dev);
+ platform_device_register(>a01_pm_gsm_dev);
-+ platform_device_register(>a01_pm_gps_dev);
+
-+ if (system_rev == GTA01Bv2_SYSTEM_REV ||
-+ system_rev == GTA01Bv3_SYSTEM_REV)
-+ platform_device_register(>a01_pm_bt_dev);
-+
+ s3c2410_pm_init();
-+
+}
+
+MACHINE_START(GTA01, "GTA01")
@@ -556,10 +542,10 @@
+MACHINE_END
+
+
-Index: linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h
+Index: linux-2.6.20.1/include/asm-arm/arch-s3c2410/gta01.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/include/asm-arm/arch-s3c2410/gta01.h 2007-02-20
18:43:31.000000000 +0100
++++ linux-2.6.20.1/include/asm-arm/arch-s3c2410/gta01.h 2007-03-02
18:39:51.000000000 +0100
@@ -0,0 +1,60 @@
+#ifndef _GTA01_H
+#define _GTA01_H
Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-03-02
16:35:58 UTC (rev 1220)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-03-02
17:47:53 UTC (rev 1221)
@@ -3,8 +3,8 @@
Index: linux-2.6.20.1/drivers/i2c/chips/pcf50606.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.c 2007-03-01
18:43:27.000000000 +0100
-@@ -0,0 +1,1590 @@
++++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.c 2007-03-02
18:41:31.000000000 +0100
+@@ -0,0 +1,1613 @@
+/* Philips PCF50606 Power Management Unit (PMU) driver
+ *
+ * (C) 2006 by OpenMoko, Inc.
@@ -48,6 +48,7 @@
+#include <linux/miscdevice.h>
+#include <linux/input.h>
+#include <linux/sched.h>
++#include <linux/platform_device.h>
+#include <linux/pcf50606.h>
+
+#include <asm/apm.h>
@@ -1329,6 +1330,18 @@
+ * Input device
+ ***********************************************************************/
+
++#ifdef CONFIG_MACH_GTA01
++/* We currently place those platform devices here to make sure the device
++ * suspend/resume order is correct */
++static struct platform_device gta01_pm_gps_dev = {
++ .name ="gta01-pm-gps",
++};
++
++static struct platform_device gta01_pm_bt_dev = {
++ .name ="gta01-pm-bt",
++};
++#endif
++
+static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+ struct i2c_client *new_client;
@@ -1436,6 +1449,16 @@
+
+ apm_get_power_status = pcf50606_get_power_status;
+
++#ifdef CONFIG_MACH_GTA01
++ gta01_pm_bt_dev.dev.parent = &new_client->dev;
++ gta01_pm_gps_dev.dev.parent = &new_client->dev;
++ if (system_rev == GTA01Bv2_SYSTEM_REV ||
++ system_rev == GTA01Bv3_SYSTEM_REV)
++ platform_device_register(>a01_pm_bt_dev);
++
++ platform_device_register(>a01_pm_gps_dev);
++#endif
++
+ return 0;
+exit_misc:
+ misc_deregister(&pcf50606_wdt_miscdev);
@@ -1598,7 +1621,7 @@
Index: linux-2.6.20.1/drivers/i2c/chips/pcf50606.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.h 2007-02-26
00:46:55.000000000 +0100
++++ linux-2.6.20.1/drivers/i2c/chips/pcf50606.h 2007-03-02
17:33:25.000000000 +0100
@@ -0,0 +1,259 @@
+#ifndef _PCF50606_H
+#define _PCF50606_H
@@ -1861,8 +1884,8 @@
+
Index: linux-2.6.20.1/drivers/i2c/chips/Kconfig
===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Kconfig 2007-02-26
00:46:47.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Kconfig 2007-02-26 00:46:56.000000000
+0100
+--- linux-2.6.20.1.orig/drivers/i2c/chips/Kconfig 2007-03-02
17:32:22.000000000 +0100
++++ linux-2.6.20.1/drivers/i2c/chips/Kconfig 2007-03-02 17:33:25.000000000
+0100
@@ -36,6 +36,17 @@
This driver can also be built as a module. If so, the module
will be called eeprom.
@@ -1883,8 +1906,8 @@
depends on I2C && EXPERIMENTAL
Index: linux-2.6.20.1/drivers/i2c/chips/Makefile
===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Makefile 2007-02-26
00:46:47.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Makefile 2007-02-26 00:46:56.000000000
+0100
+--- linux-2.6.20.1.orig/drivers/i2c/chips/Makefile 2007-03-02
17:32:22.000000000 +0100
++++ linux-2.6.20.1/drivers/i2c/chips/Makefile 2007-03-02 17:33:25.000000000
+0100
@@ -8,6 +8,7 @@
obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
obj-$(CONFIG_SENSORS_M41T00) += m41t00.o
@@ -1895,8 +1918,8 @@
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
Index: linux-2.6.20.1/include/linux/i2c-id.h
===================================================================
---- linux-2.6.20.1.orig/include/linux/i2c-id.h 2007-02-26 00:46:55.000000000
+0100
-+++ linux-2.6.20.1/include/linux/i2c-id.h 2007-02-26 00:46:56.000000000
+0100
+--- linux-2.6.20.1.orig/include/linux/i2c-id.h 2007-03-02 17:33:24.000000000
+0100
++++ linux-2.6.20.1/include/linux/i2c-id.h 2007-03-02 17:33:25.000000000
+0100
@@ -159,6 +159,7 @@
#define I2C_DRIVERID_FSCHER 1046
#define I2C_DRIVERID_W83L785TS 1047
@@ -1908,7 +1931,7 @@
Index: linux-2.6.20.1/include/linux/pcf50606.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20.1/include/linux/pcf50606.h 2007-02-26 00:46:56.000000000
+0100
++++ linux-2.6.20.1/include/linux/pcf50606.h 2007-03-02 17:33:25.000000000
+0100
@@ -0,0 +1,55 @@
+#ifndef _LINUX_PCF50606_H
+#define _LINUX_PCF50606_H
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-02 20:32:29 +0100 (Fri, 02 Mar 2007)
New Revision: 1222
Modified:
trunk/src/target/kernel/patches/gta01-backlight.patch
Log:
drivers/video/backlight/gta01_bl.c (gta01bl_probe): moved hardware
initialization to new function gta01bl_init_hw
drivers/video/backlight/gta01_bl.c (gta01bl_init_hw): added #if 1 ... #endif
around mysterious initialization code
drivers/video/backlight/gta01_bl.c (gta01bl_resume): call gta01bl_init_hw
Modified: trunk/src/target/kernel/patches/gta01-backlight.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-backlight.patch 2007-03-02
17:47:53 UTC (rev 1221)
+++ trunk/src/target/kernel/patches/gta01-backlight.patch 2007-03-02
19:32:29 UTC (rev 1222)
@@ -1,10 +1,10 @@
This is a backlight driver for FIC's Neo1973 Phone (codename GTA01)
-Index: linux-2.6.20/drivers/video/backlight/Kconfig
+Index: linux-2.6.20.1/drivers/video/backlight/Kconfig
===================================================================
---- linux-2.6.20.orig/drivers/video/backlight/Kconfig 2007-02-15
16:26:53.000000000 +0100
-+++ linux-2.6.20/drivers/video/backlight/Kconfig 2007-02-15
16:28:11.000000000 +0100
-@@ -58,6 +58,14 @@
+--- linux-2.6.20.1.orig/drivers/video/backlight/Kconfig
++++ linux-2.6.20.1/drivers/video/backlight/Kconfig
+@@ -58,6 +58,14 @@ config BACKLIGHT_LOCOMO
If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y
to
enable the LCD/backlight driver.
@@ -19,10 +19,10 @@
config BACKLIGHT_HP680
tristate "HP Jornada 680 Backlight Driver"
depends on BACKLIGHT_DEVICE && SH_HP6XX
-Index: linux-2.6.20/drivers/video/backlight/Makefile
+Index: linux-2.6.20.1/drivers/video/backlight/Makefile
===================================================================
---- linux-2.6.20.orig/drivers/video/backlight/Makefile 2007-02-15
16:26:53.000000000 +0100
-+++ linux-2.6.20/drivers/video/backlight/Makefile 2007-02-15
16:28:11.000000000 +0100
+--- linux-2.6.20.1.orig/drivers/video/backlight/Makefile
++++ linux-2.6.20.1/drivers/video/backlight/Makefile
@@ -3,5 +3,6 @@
obj-$(CONFIG_LCD_CLASS_DEVICE) += lcd.o
obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
@@ -30,11 +30,11 @@
+obj-$(CONFIG_BACKLIGHT_GTA01) += gta01_bl.o
obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o
-Index: linux-2.6.20/drivers/video/backlight/gta01_bl.c
+Index: linux-2.6.20.1/drivers/video/backlight/gta01_bl.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.20/drivers/video/backlight/gta01_bl.c 2007-02-15
17:02:00.000000000 +0100
-@@ -0,0 +1,276 @@
+--- /dev/null
++++ linux-2.6.20.1/drivers/video/backlight/gta01_bl.c
+@@ -0,0 +1,287 @@
+/*
+ * Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
+ *
@@ -136,6 +136,52 @@
+ return 0;
+}
+
++static void gta01bl_init_hw(void)
++{
++ unsigned long tcon, tcfg0, tcfg1, tcnt, pclk;
++
++ pclk = clk_get_rate(gta01bl.clk);
++
++ tcon = __raw_readl(S3C2410_TCON);
++ tcfg1 = __raw_readl(S3C2410_TCFG1);
++ tcfg0 = __raw_readl(S3C2410_TCFG0);
++
++ tcfg1 &= ~S3C2410_TCFG1_MUX0_MASK;
++ tcfg1 |= S3C2410_TCFG1_MUX0_DIV8;
++
++ tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
++ tcfg0 |= (4 - 1);
++
++ tcnt = (pclk / 32) / GTA01BL_FREQ;
++ tcnt--;
++
++ __raw_writel(tcfg1, S3C2410_TCFG1);
++ __raw_writel(tcfg0, S3C2410_TCFG0);
++
++#if 1
++ __raw_writel(tcnt, S3C2410_TCNTB(0));
++ __raw_writel(tcon, S3C2410_TCON);
++ __raw_writel(tcnt, S3C2410_TCNTB(0));
++#endif
++
++ /* ensure timer is stopped */
++
++ tcon &= 0xffffff00;
++ 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));
++
++ /* start the timer */
++ tcon |= S3C2410_TCON_T0START;
++ tcon &= ~S3C2410_TCON_T0MANUALUPD;
++ __raw_writel(tcon, S3C2410_TCON);
++
++ gta01bl_prop.max_brightness = tcnt;
++}
++
+#ifdef CONFIG_PM
+static int gta01bl_suspend(struct platform_device *dev, pm_message_t state)
+{
@@ -146,6 +192,10 @@
+
+static int gta01bl_resume(struct platform_device *dev)
+{
++ mutex_lock(>a01bl.mutex);
++ gta01bl_init_hw();
++ mutex_unlock(>a01bl.mutex);
++
+ gta01bl_flags &= ~GTA01BL_SUSPENDED;
+ gta01bl_send_intensity(gta01_backlight_device);
+ return 0;
@@ -195,8 +245,6 @@
+ s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
+ gta01bl_prop.max_brightness = 1;
+#else
-+ unsigned long tcon, tcfg0, tcfg1, tcnt, pclk;
-+
+ /* use s3c_device_timer0 for PWM */
+ gta01bl.clk = clk_get(NULL, "timers");
+ if (IS_ERR(gta01bl.clk))
@@ -204,44 +252,7 @@
+
+ clk_enable(gta01bl.clk);
+
-+ pclk = clk_get_rate(gta01bl.clk);
-+
-+ tcon = __raw_readl(S3C2410_TCON);
-+ tcfg1 = __raw_readl(S3C2410_TCFG1);
-+ tcfg0 = __raw_readl(S3C2410_TCFG0);
-+
-+ tcfg1 &= ~S3C2410_TCFG1_MUX0_MASK;
-+ tcfg1 |= S3C2410_TCFG1_MUX0_DIV8;
-+
-+ tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-+ tcfg0 |= (4 - 1);
-+
-+ tcnt = (pclk / 32) / GTA01BL_FREQ;
-+ tcnt--;
-+
-+ __raw_writel(tcfg1, S3C2410_TCFG1);
-+ __raw_writel(tcfg0, S3C2410_TCFG0);
-+
-+ __raw_writel(tcnt, S3C2410_TCNTB(0));
-+ __raw_writel(tcon, S3C2410_TCON);
-+ __raw_writel(tcnt, S3C2410_TCNTB(0));
-+
-+ /* ensure timer is stopped */
-+
-+ tcon &= 0xffffff00;
-+ 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));
-+
-+ /* start the timer */
-+ tcon |= S3C2410_TCON_T0START;
-+ tcon &= ~S3C2410_TCON_T0MANUALUPD;
-+ __raw_writel(tcon, S3C2410_TCON);
-+
-+ gta01bl_prop.max_brightness = tcnt;
++ gta01bl_init_hw();
+#endif
+ mutex_init(>a01bl.mutex);
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-02 21:02:34 +0100 (Fri, 02 Mar 2007)
New Revision: 1223
Modified:
trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20.1-fic-gta01
Log:
* four VT devices are enough
* include QT2410 button driver
* disable legacy pty's
* make sure MMC core is part of linked kernel
Modified: trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
===================================================================
--- trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
2007-03-02 19:32:29 UTC (rev 1222)
+++ trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20-fic-gta01
2007-03-02 20:02:34 UTC (rev 1223)
@@ -848,6 +848,7 @@
# CONFIG_KEYBOARD_NEWTON is not set
CONFIG_KEYBOARD_STOWAWAY=m
CONFIG_KEYBOARD_GTA01=y
+CONFIG_KEYBOARD_QT2410=y
CONFIG_INPUT_MOUSE=y
# CONFIG_MOUSE_PS2 is not set
# CONFIG_MOUSE_SERIAL is not set
@@ -880,6 +881,7 @@
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
+CONFIG_NR_TTY_DEVICES=4
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_SERIAL_NONSTANDARD is not set
@@ -897,8 +899,7 @@
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
@@ -1449,9 +1450,9 @@
#
# MMC/SD Card support
#
-CONFIG_MMC=m
+CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
# CONFIG_MMC_TIFM_SD is not set
CONFIG_MMC_S3C=m
Modified: trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20.1-fic-gta01
===================================================================
--- trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20.1-fic-gta01
2007-03-02 19:32:29 UTC (rev 1222)
+++ trunk/oe/packages/linux/linux-gta01/defconfig-2.6.20.1-fic-gta01
2007-03-02 20:02:34 UTC (rev 1223)
@@ -848,6 +848,7 @@
# CONFIG_KEYBOARD_NEWTON is not set
CONFIG_KEYBOARD_STOWAWAY=m
CONFIG_KEYBOARD_GTA01=y
+CONFIG_KEYBOARD_QT2410=y
CONFIG_INPUT_MOUSE=y
# CONFIG_MOUSE_PS2 is not set
# CONFIG_MOUSE_SERIAL is not set
@@ -880,6 +881,7 @@
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
+CONFIG_NR_TTY_DEVICES=4
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_SERIAL_NONSTANDARD is not set
@@ -897,8 +899,7 @@
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
@@ -1449,9 +1450,9 @@
#
# MMC/SD Card support
#
-CONFIG_MMC=m
+CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
# CONFIG_MMC_TIFM_SD is not set
CONFIG_MMC_S3C=m
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-03-02 21:02:56 +0100 (Fri, 02 Mar 2007)
New Revision: 1224
Modified:
trunk/oe/conf/machine/fic-gta01.conf
Log:
we want s3cmci to be part of the root filesystem
Modified: trunk/oe/conf/machine/fic-gta01.conf
===================================================================
--- trunk/oe/conf/machine/fic-gta01.conf 2007-03-02 20:02:34 UTC (rev
1223)
+++ trunk/oe/conf/machine/fic-gta01.conf 2007-03-02 20:02:56 UTC (rev
1224)
@@ -15,6 +15,7 @@
# package gta01 specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-s3cmci \
kernel-module-gta01-pm-bt \
kernel-module-gta01-pm-gps \
kernel-module-gta01-pm-gsm"
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-03-02 22:15:39 +0100 (Fri, 02 Mar 2007)
New Revision: 1225
Modified:
trunk/src/host/devirginator/Makefile
trunk/src/host/devirginator/setup.sh
Log:
setup.sh: added option -t to create a portable tarball (UNTESTED)
setup.sh: moved test whether file exists locally into "download"
setup.sh: added download of dfu-util and, optionally, openocd and openocd.cfg
Makefile: added tarball creation (UNTESTED)
Modified: trunk/src/host/devirginator/Makefile
===================================================================
--- trunk/src/host/devirginator/Makefile 2007-03-02 20:02:56 UTC (rev
1224)
+++ trunk/src/host/devirginator/Makefile 2007-03-02 21:15:39 UTC (rev
1225)
@@ -20,6 +20,13 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
+
+DIR=devirginator
+SCRIPTS=crc32.pl envedit.pl openocdcmd.pl scriptify.pl devirginate
+TARBALL=devirg-$(TARBALL_VERSION).tar.gz
+
+.PHONY: tarball
+
devirginate: config environment.in openocd.in u-boot.in \
setup.sh smiley.gz \
crc32.pl envedit.pl openocdcmd.pl scriptify.pl
@@ -41,3 +48,15 @@
@echo 'Please provide a "config" file.' 1>&2
@echo 'See "config.example" for details.' 1>&2
@exit 1
+
+tarball: $(TARBALL)
+
+$(TARBALL):
+ @[ ! -z "$(TARBALL_VERSION)" ] || \
+ { echo "Please set TARBALL_VERSION"; exit 1; }
+ cd .. && ln -sf $(DIR) $(DIR)-$(TARBALL_VERSION) && \
+ tar cfz $(DIR)/$(TARBALL) \
+ $(SCRIPTS:%=$(DIR)-$(TARBALL_VERSION)/%) \
+ $(DIR)-$(TARBALL_VERSION)/tmp/ || \
+ { rm -f $(DIR)-$(TARBALL_VERSION); exit 1; }
+ rm -f $(DIR)-$(TARBALL_VERSION)
Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh 2007-03-02 20:02:56 UTC (rev
1224)
+++ trunk/src/host/devirginator/setup.sh 2007-03-02 21:15:39 UTC (rev
1225)
@@ -30,6 +30,14 @@
download()
{
+ if [ -r "$2" ]; then
+ if $tarball; then
+ base="`basename \"$2\"`"
+ cp "$2" "tmp/$base"
+ eval $1=\"tmp/$base\"
+ fi
+ return
+ fi
index=tmp/index-${SNAPSHOT}.html
if [ ! -f $index ]; then
wget -O tmp/index "`dirname \"$2\"`/"
@@ -49,7 +57,11 @@
base="`basename \"$n\"`"
cd tmp
wget -N "$n" || { rm -f $base; exit 1; }
- eval $1=\"$PWD/$base\"
+ if $tarball; then
+ eval $1=\"tmp/$base\"
+ else
+ eval $1=\"$PWD/$base\"
+ fi
cd ..
}
@@ -77,8 +89,25 @@
# Locations
SPLASH=http://wiki.openmoko.org/images/c/c2/System_boot.png
+
+# --- Command line parsing ----------------------------------------------------
+
+
+usage()
+{
+ echo "usage: $0 [-t] [variable=value ...]" 1>&2
+ exit 1
+}
+
+
+tarball=false
+
for n in "$@"; do
- eval "$n"
+ case "$n" in
+ -t) tarball=true;;
+ *=*) eval "$n";;
+ *) usage;;
+ esac
done
@@ -88,13 +117,6 @@
. config
-# --- Check executables -------------------------------------------------------
-
-
-probe "$DFU_UTIL" -l
-probe telnet </dev/null
-
-
# --- Post configuration ------------------------------------------------------
@@ -108,27 +130,21 @@
if [ -z "$LOWLEVEL" ]; then
LOWLEVEL=${RELEASE_DIR}/lowlevel_foo-${PLATFORM}${BOARD}-'*'.bin
fi
-if [ ! -f "$LOWLEVEL" ]; then
- download LOWLEVEL "$LOWLEVEL"
-fi
+download LOWLEVEL "$LOWLEVEL"
# u-boot.bin
if [ -z "$UBOOT" ]; then
UBOOT=${RELEASE_DIR}/u-boot-${PLATFORM}${BOARD}-'*'.bin
fi
-if [ ! -f "$UBOOT" ]; then
- download UBOOT "$UBOOT"
-fi
+download UBOOT "$UBOOT"
# uImage.bin
if [ -z "$UIMAGE" ]; then
UIMAGE=${RELEASE_DIR}/uImage-2.6-'*'-fic-${PLATFORM}-'*'.bin
fi
-if [ ! -r "$UIMAGE" ]; then
- download UIMAGE "$UIMAGE"
-fi
+download UIMAGE "$UIMAGE"
## # modules.tar.gz
##
@@ -153,18 +169,59 @@
if [ -z "$ROOTFS" ]; then
ROOTFS=${RELEASE_DIR}/openmoko-devel-image-fic-${PLATFORM}-'*'.rootfs.jffs2
fi
-if [ ! -r "$ROOTFS" ]; then
- download ROOTFS "$ROOTFS"
-fi
+download ROOTFS "$ROOTFS"
-
# Splash screen
if [ ! -f "$SPLASH" ]; then
download SPLASH "$SPLASH"
fi
+# dfu-util
+#
+# Search priority:
+# - direct file
+# - command in local PATH
+# - URL
+#
+if [ ! -r "$DFU_UTIL" ]; then
+ if found="`which \"$DFU_UTIL\" 2>/dev/null`"; then
+ DFU_UTIL="$found"
+ fi
+fi
+download DFU_UTIL "$DFU_UTIL"
+chmod +x "$DFU_UTIL"
+# openocd
+
+if [ ! -z "$OPENOCD" ]; then
+ if [ ! -r "$OPENOCD" ]; then
+ if found="`which \"$OPENOCD\" 2>/dev/null`"; then
+ OPENOCD="$found"
+ fi
+ fi
+ download OPENOCD "$OPENOCD"
+ chmod +x "$OPENOCD"
+fi
+
+if [ ! -z "$OPENOCD_CONFIG" ]; then
+ download OPENOCD_CONFIG "$OPENOCD_CONFIG"
+fi
+
+# Set default for TARBALL_VERSION
+
+if [ -z "$TARBALL_VERSION" ]; then
+ TARBALL_VERSION="$SNAPSHOT"
+fi
+
+
+# --- Check executables -------------------------------------------------------
+
+
+probe "$DFU_UTIL" -l
+probe telnet </dev/null
+
+
# --- Stage 1: OpenOCD script -------------------------------------------------
@@ -198,6 +255,7 @@
# --- Stage 1: smiley splash screen -------------------------------------------
+
export OMDIR
make smiley.gz
mv smiley.gz tmp/
@@ -295,17 +353,41 @@
# --- Done --------------------------------------------------------------------
+if $tarball; then
+ make tarball TARBALL_VERSION="$TARBALL_VERSION"
cat <<EOF
-------------------------------------------------------------------------------
Your devirginator is now ready.
+To install it on a new machine,
+
+- copy the file devirg-${TARBALL_VERSION}.tar.gz to the new machine
+- tar xfz devirg-${TARBALL_VERSION}.tar.gz
+- cd devirginator-${TARBALL_VERSION}
+
To set up a device,
- connect it to power and JTAG
- switch it on
- run ./devirginate
-- wait until the smiley appears (takes about 1-2 minutes)
+- follow the progress, as described in README
-------------------------------------------------------------------------------
EOF
+else
+cat <<EOF
+-------------------------------------------------------------------------------
+
+Your devirginator is now ready.
+
+To set up a device,
+
+- connect it to power and JTAG
+- switch it on
+- run ./devirginate
+- follow the progress, as described in README
+
+-------------------------------------------------------------------------------
+EOF
+fi
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
