Menu
▾
▴
hackndev-commit — Subversion commits (with diffs)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(26) |
Sep
(22) |
Oct
(55) |
Nov
(24) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(68) |
Feb
(85) |
Mar
(54) |
Apr
(12) |
May
(52) |
Jun
(75) |
Jul
(116) |
Aug
(71) |
Sep
(54) |
Oct
|
Nov
(2) |
Dec
|
|
From: <cri...@us...> - 2006-08-26 15:51:20
|
Revision: 558 Author: cristianop Date: 2006-08-26 08:51:13 -0700 (Sat, 26 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=558&view=rev Log Message: ----------- palmtx: handling jitter with input's absfuzz Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-26 13:58:50 UTC (rev 557) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-26 15:51:13 UTC (rev 558) @@ -36,23 +36,22 @@ #include <sound/initval.h> #include <sound/ac97_codec.h> - -#define X_AXIS_MAX 3630 //3900 //3630 -#define X_AXIS_MIN 200 //350 //200 -#define Y_AXIS_MAX 3880 //3750 //3880 -#define Y_AXIS_MIN 160 //320 //160 +#define X_AXIS_MAX 3900 //3630 +#define X_AXIS_MIN 350 //200 +#define Y_AXIS_MAX 3750 //3880 +#define Y_AXIS_MIN 320 //160 #define PRESSURE_MIN 0 #define PRESSURE_MAX 150 //300 #define DIG2_INIT 0x0001 /* initial value for digitiser2 register */ -#define WM9712_PIL 0x00100 -#define WM97XX_POLL 0x8000 /* initiate a polling measurement */ -#define AC97_LINK_FRAME 21 /* time in uS for AC97 link frame */ -#define DEFAULT_PRESSURE_TRESHOLD 45160 /* default pressure treshold for pen up/down */ -#define DEFAULT_X_JITTER_TRESHOLD 5; -#define DEFAULT_Y_JITTER_TRESHOLD 35; +#define AC97_LINK_FRAME 21 /* time in uS for AC97 link frame */ +#define DEFAULT_PRESSURE_TRESHOLD 45160 /* default pressure treshold for pen up/down */ +#define DEFAULT_X_AXIS_FUZZ 5 /* default x axis noise treshold */ +#define DEFAULT_Y_AXIS_FUZZ 35 /* default y axis noise treshold */ +#define PRESSURE_FUZZ 5 /* default pressure noise treshold */ + #define palmld_ac97_WORK_QUEUE_NAME "palmld_ac97.c" @@ -64,19 +63,18 @@ module_param(dbglvl, int, 0); MODULE_PARM_DESC(dbglvl, "debug level (0 is disabled)"); -static int xdjtrsh = DEFAULT_X_JITTER_TRESHOLD; +static int xdjtrsh = DEFAULT_X_AXIS_FUZZ; module_param(xdjtrsh, int, 0); -MODULE_PARM_DESC(xdjtrsh, "treshold for x coordinates jitter"); +MODULE_PARM_DESC(xdjtrsh, "treshold for x axis jitter"); -static int ydjtrsh = DEFAULT_Y_JITTER_TRESHOLD; +static int ydjtrsh = DEFAULT_Y_AXIS_FUZZ; module_param(ydjtrsh, int, 0); -MODULE_PARM_DESC(ydjtrsh, "treshold for y coordinates jitter"); +MODULE_PARM_DESC(ydjtrsh, "treshold for y axis jitter"); static DECLARE_MUTEX_LOCKED(queue_sem); static DECLARE_MUTEX(digitiser_sem); static DECLARE_MUTEX(battery_update_mutex); - static struct workqueue_struct *palmld_ac97_workqueue; static struct work_struct palmld_ac97_irq_task; @@ -88,8 +86,6 @@ static int previous_voltage; static u16 d2base; -static int lastx = 0; -static int lasty = 0; #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) /* original APM hook */ @@ -111,7 +107,8 @@ GEn &= ~gpio; ac97->bus->ops->write(ac97, 0x56, GEn); } - + + void wm97xx_gpio_mode(ac97_t *ac97, int gpio, int config, int polarity, int sticky, int wakeup) { @@ -147,15 +144,15 @@ ac97->bus->ops->write(ac97, 0x52, GWn); } + static void wm97xx_set_digitiser_power(struct device *dev, int value) { ac97_t *ac97 = dev->platform_data; - u16 d2 = d2base; - - d2 |= value; - ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); + + ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2base | value); } + /* * note: for the TX there's some code that gets enabled in linux/sound/pxa2xx-ac97.c * (ifdef CONFIG_MACH_PALMTX) that tries to implement some recommended procedure for @@ -163,7 +160,6 @@ * (PXA27x Specification Update: 28007109.pdf sec.: E54) */ - static int palmld_ac97_take_reading(struct device *dev, int adcsel) { ac97_t *ac97 = dev->platform_data; @@ -171,33 +167,34 @@ u16 r76 = 0; u16 r7a; - r76 |= adcsel; /* set ADCSEL */ - r76 |= WM97XX_DELAY(3); /* set DELAY */ - r76 &= ~(1<<11); /* COO = 0 (single measurement) */ - r76 &= ~(1<<10); /* CTC = 0 (polling mode) */ - r76 |= (1<<15); /* start reading */ + r76 |= adcsel; /* set ADCSEL (ADC source) */ + r76 |= WM97XX_DELAY(3); /* set settling time delay DELAY */ + r76 &= ~(1<<11); /* COO = 0 (single measurement) */ + r76 &= ~(1<<10); /* CTC = 0 (polling mode) */ + r76 |= (1<<15); /* initiate measurement (POLL) */ ac97->bus->ops->write(ac97, 0x76, r76); - // some code from the the wolfson' driver + // wait settling time udelay ((3 * AC97_LINK_FRAME) + 167); /* wait for POLL to go low */ - while((ac97->bus->ops->read(ac97, 0x76) & 0x8000) && timeout){ udelay(AC97_LINK_FRAME); timeout--; } if (timeout == 0){ - printk("wm9712: discarding reading due to poll wait timout on 0x76\n"); + printk("wm9712: discarding reading due to POLL wait timout on 0x76\n"); return 0; } r7a = ac97->bus->ops->read(ac97, 0x7a); - // todo: print an error here - if ((r7a & WM97XX_ADCSEL_MASK) != adcsel) + + if ((r7a & WM97XX_ADCSEL_MASK) != adcsel){ + printk("wm9712: discarding reading -> wrong ADC source\n"); return 0; - + } + return (int) r7a; } @@ -255,14 +252,17 @@ { return PALMTX_BAT_MIN_VOLTAGE; } + int get_min_charge(struct battery *b) { return PALMTX_BAT_MIN_CHARGE; } + int get_max_voltage(struct battery *b) { return PALMTX_BAT_MAX_VOLTAGE; /* mV */ } + int get_max_charge(struct battery *b) { return PALMTX_BAT_MAX_CHARGE; @@ -280,6 +280,7 @@ { return 0; } + int get_status(struct battery *b) { int ac_connected = 0; @@ -342,7 +343,6 @@ static void palmld_ac97_pendown(struct device *dev) { int xread, yread, pressure; - int xval, yval; int valid_coords=0, btn_pressed = 0; /* take readings until the pen goes up */ @@ -352,22 +352,15 @@ yread = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_Y); pressure = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_PRES); - //valid_coords = (xread & 0xfff) && (yread & 0xfff) && (pressure & 0xfff); - xval = xread & 0xfff; - yval = yread & 0xfff; - valid_coords = (xval) && (yval) && (pressure & 0xfff); + valid_coords = (xread & 0xfff) && (yread & 0xfff) && (pressure & 0xfff); if(valid_coords && (pressure < ptrsh)) { - if(abs(xval - lastx) <= xdjtrsh){ xval = lastx; } - if(abs(yval - lasty) <= ydjtrsh){ yval = lasty; } btn_pressed = 1; input_report_key(palmld_ac97_input, BTN_TOUCH, 1); - input_report_abs(palmld_ac97_input, ABS_X, xval); - input_report_abs(palmld_ac97_input, ABS_Y, yval); + input_report_abs(palmld_ac97_input, ABS_X, xread & 0xfff); + input_report_abs(palmld_ac97_input, ABS_Y, yread & 0xfff); input_report_abs(palmld_ac97_input, ABS_PRESSURE, pressure & 0xfff); input_sync(palmld_ac97_input); - lastx = xval; - lasty = yval; set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/100); @@ -382,12 +375,11 @@ input_report_abs(palmld_ac97_input, ABS_Y, 0); input_report_abs(palmld_ac97_input, ABS_PRESSURE, 0); input_sync(palmld_ac97_input); - lastx = 0; - lasty = 0; } } + static void palmld_ac97_irq_work(void *data) { struct device *dev = data; @@ -421,12 +413,9 @@ enable_irq(IRQ_GPIO_PALMTX_WM9712_IRQ); } + static irqreturn_t palmld_ac97_irq_handler(int irq, void *dev_id, struct pt_regs *regs) { - /* - * we can't use ac97 from within the interrupt handler, so schedule a task - * to do the actual handling. - */ if (down_trylock(&queue_sem) == 0){ disable_irq(IRQ_GPIO_PALMTX_WM9712_IRQ); queue_work(palmld_ac97_workqueue, &palmld_ac97_irq_task); @@ -440,7 +429,7 @@ { int err; ac97_t *ac97 = dev->platform_data; - u16 d2; // init d1 too? + u16 d2 = DIG2_INIT; // init d1 too? if(!machine_is_xscale_palmtx()) return -ENODEV; @@ -461,12 +450,10 @@ ac97->bus->ops->write(ac97, 0x54, 0); /* disable digitiser to save power, enable pen-down detect */ - d2 = DIG2_INIT; d2 |= WM97XX_PRP_DET; d2base = d2; - ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); + ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2base); - /* enable interrupts on codec's gpio 2 (connected to cpu gpio 27) */ wm97xx_gpio_mode(ac97, WM97XX_GPIO_2, WM97XX_GPIO_IN, WM97XX_GPIO_POL_HIGH, WM97XX_GPIO_NOTSTICKY, WM97XX_GPIO_NOWAKE); @@ -475,23 +462,22 @@ /* enable pen detect interrupt */ wm97xx_gpio_mode(ac97, WM97XX_GPIO_13, WM97XX_GPIO_IN, WM97XX_GPIO_POL_HIGH, WM97XX_GPIO_STICKY, WM97XX_GPIO_WAKE); + /* turn off irq gpio inverting */ ac97->bus->ops->write(ac97, 0x58, ac97->bus->ops->read(ac97, 0x58)&~1); /* turn on the digitiser and pen down detector */ - d2 = ac97->bus->ops->read(ac97, AC97_WM97XX_DIGITISER2); - d2 |= WM97XX_PRP_DETW; - ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); + ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2base | WM97XX_PRP_DETW); /* setup the input device */ palmld_ac97_input = input_allocate_device(); palmld_ac97_input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); palmld_ac97_input->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); - input_set_abs_params(palmld_ac97_input, ABS_X, X_AXIS_MIN, X_AXIS_MAX, 0, 0); - input_set_abs_params(palmld_ac97_input, ABS_Y, Y_AXIS_MIN, Y_AXIS_MAX, 0, 0); - input_set_abs_params(palmld_ac97_input, ABS_PRESSURE, PRESSURE_MIN, PRESSURE_MAX, 0, 0); + input_set_abs_params(palmld_ac97_input, ABS_X, X_AXIS_MIN, X_AXIS_MAX, xdjtrsh, 0); + input_set_abs_params(palmld_ac97_input, ABS_Y, Y_AXIS_MIN, Y_AXIS_MAX, ydjtrsh, 0); + input_set_abs_params(palmld_ac97_input, ABS_PRESSURE, PRESSURE_MIN, PRESSURE_MAX, PRESSURE_FUZZ, 0); palmld_ac97_input->name = "Palm TX touchscreen (Wolfson WM9712)"; palmld_ac97_input->dev = dev; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <far...@us...> - 2006-08-26 13:58:56
|
Revision: 557 Author: farcaller Date: 2006-08-26 06:58:50 -0700 (Sat, 26 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=557&view=rev Log Message: ----------- palmt3: fixed GPIO14 assignment Modified Paths: -------------- linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c Modified: linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c =================================================================== --- linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c 2006-08-25 19:04:15 UTC (rev 556) +++ linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c 2006-08-26 13:58:50 UTC (rev 557) @@ -38,6 +38,9 @@ #ifdef CONFIG_MACH_T3XSCALE // T3 patch // FIXME xscale GPIOs +#include <asm/arch/irqs.h> +#define T3_TPS65010_GPIO 14 + #else #include <asm/arch/gpio.h> #include <asm/arch/mux.h> @@ -475,7 +478,9 @@ #ifdef CONFIG_ARM #ifdef CONFIG_MACH_T3XSCALE // T3 patch - // FIXME xscale GPIO request + //if (machine_is_t3xscale()) + // free_irq(IRQ_GPIO(T3_TPS65010_GPIO), (void*) 0); + // done later #else if (machine_is_omap_h2()) omap_free_gpio(58); @@ -485,7 +490,7 @@ #endif // FIXME no interrupt for T3 yet - //free_irq(tps->irq, tps); + free_irq(tps->irq, tps); debugfs_remove(tps->file); if (i2c_detach_client(client) == 0) kfree(tps); @@ -535,9 +540,11 @@ #ifdef CONFIG_ARM #ifdef CONFIG_MACH_T3XSCALE // T3 patch - // FIXME T3 irqflags = SA_SAMPLE_RANDOM; tps->model = TPS65010; + tps->irq = IRQ_GPIO(T3_TPS65010_GPIO); + // is it ok to do this here? + set_irq_type (IRQ_GPIO(T3_TPS65010_GPIO), IRQT_FALLING); #else irqflags = SA_SAMPLE_RANDOM | SA_TRIGGER_LOW; if (machine_is_omap_h2()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-25 19:04:30
|
Revision: 556 Author: magon Date: 2006-08-25 12:04:15 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=556&view=rev Log Message: ----------- palmt3: tpc65010 works compiled-in, tsc2101 remove fix Modified Paths: -------------- linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c linux4palm/linux/trunk/drivers/input/touchscreen/palmt3_ts.c linux4palm/linux/trunk/drivers/soc/tsc2101.c Modified: linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c =================================================================== --- linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c 2006-08-25 18:52:15 UTC (rev 555) +++ linux4palm/linux/trunk/drivers/i2c/chips/tps65010.c 2006-08-25 19:04:15 UTC (rev 556) @@ -1090,7 +1090,9 @@ * That is, much earlier than on PC-type systems, which don't often use * I2C as a core system bus. */ -subsys_initcall(tps_init); +//subsys_initcall(tps_init); +// This is fast enougth +module_init(tps_init); static void __exit tps_exit(void) { Modified: linux4palm/linux/trunk/drivers/input/touchscreen/palmt3_ts.c =================================================================== --- linux4palm/linux/trunk/drivers/input/touchscreen/palmt3_ts.c 2006-08-25 18:52:15 UTC (rev 555) +++ linux4palm/linux/trunk/drivers/input/touchscreen/palmt3_ts.c 2006-08-25 19:04:15 UTC (rev 556) @@ -118,3 +118,5 @@ module_init(palmt3_ts_init); module_exit(palmt3_ts_cleanup); + +MODULE_LICENCE("GPL"); Modified: linux4palm/linux/trunk/drivers/soc/tsc2101.c =================================================================== --- linux4palm/linux/trunk/drivers/soc/tsc2101.c 2006-08-25 18:52:15 UTC (rev 555) +++ linux4palm/linux/trunk/drivers/soc/tsc2101.c 2006-08-25 19:04:15 UTC (rev 556) @@ -150,6 +150,7 @@ static void tsc2101_snd_deactivate(void) { snd_pxa2xx_i2sound_i2slink_free(); + free_irq(IRQ_GPIO(55), (void*) 55); } static int tsc2101_snd_set_rate(unsigned int rate) { @@ -857,6 +858,7 @@ { int ret; ret = driver_register(&tsc2101_driver); + /* Sound driver */ snd_pxa2xx_i2sound_card_activate(&tsc2101_audio); return ret; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cri...@us...> - 2006-08-25 18:52:27
|
Revision: 555 Author: cristianop Date: 2006-08-25 11:52:15 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=555&view=rev Log Message: ----------- palmtx: fixed parameters' names Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-21 17:15:17 UTC (rev 554) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-25 18:52:15 UTC (rev 555) @@ -66,11 +66,11 @@ static int xdjtrsh = DEFAULT_X_JITTER_TRESHOLD; module_param(xdjtrsh, int, 0); -MODULE_PARM_DESC(ptrsh, "treshold for x coordinates jitter"); +MODULE_PARM_DESC(xdjtrsh, "treshold for x coordinates jitter"); static int ydjtrsh = DEFAULT_Y_JITTER_TRESHOLD; module_param(ydjtrsh, int, 0); -MODULE_PARM_DESC(ptrsh, "treshold for y coordinates jitter"); +MODULE_PARM_DESC(ydjtrsh, "treshold for y coordinates jitter"); static DECLARE_MUTEX_LOCKED(queue_sem); static DECLARE_MUTEX(digitiser_sem); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cri...@us...> - 2006-08-21 17:15:31
|
Revision: 554 Author: cristianop Date: 2006-08-21 10:15:17 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=554&view=rev Log Message: ----------- palmtx: simple handling of 'on hold' jitter Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-20 17:17:41 UTC (rev 553) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-21 17:15:17 UTC (rev 554) @@ -44,12 +44,14 @@ #define PRESSURE_MIN 0 #define PRESSURE_MAX 150 //300 +#define DIG2_INIT 0x0001 /* initial value for digitiser2 register */ #define WM9712_PIL 0x00100 #define WM97XX_POLL 0x8000 /* initiate a polling measurement */ #define AC97_LINK_FRAME 21 /* time in uS for AC97 link frame */ -#define WM97XX_DELAY(i) ((i << 4) & 0x00f0) /* sample delay times */ #define DEFAULT_PRESSURE_TRESHOLD 45160 /* default pressure treshold for pen up/down */ +#define DEFAULT_X_JITTER_TRESHOLD 5; +#define DEFAULT_Y_JITTER_TRESHOLD 35; #define palmld_ac97_WORK_QUEUE_NAME "palmld_ac97.c" @@ -62,7 +64,14 @@ module_param(dbglvl, int, 0); MODULE_PARM_DESC(dbglvl, "debug level (0 is disabled)"); +static int xdjtrsh = DEFAULT_X_JITTER_TRESHOLD; +module_param(xdjtrsh, int, 0); +MODULE_PARM_DESC(ptrsh, "treshold for x coordinates jitter"); +static int ydjtrsh = DEFAULT_Y_JITTER_TRESHOLD; +module_param(ydjtrsh, int, 0); +MODULE_PARM_DESC(ptrsh, "treshold for y coordinates jitter"); + static DECLARE_MUTEX_LOCKED(queue_sem); static DECLARE_MUTEX(digitiser_sem); static DECLARE_MUTEX(battery_update_mutex); @@ -79,6 +88,9 @@ static int previous_voltage; static u16 d2base; +static int lastx = 0; +static int lasty = 0; + #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) /* original APM hook */ static void (*apm_get_power_status_orig)(struct apm_power_info *info); @@ -329,37 +341,33 @@ static void palmld_ac97_pendown(struct device *dev) { - //ac97_t *ac97 = dev->platform_data; int xread, yread, pressure; + int xval, yval; int valid_coords=0, btn_pressed = 0; /* take readings until the pen goes up */ do { - //printk("wm9712: starting read\n"); - //down(&digitiser_sem); - - /* power up digitiser */ - //wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET_DIG); - /* take readings */ xread = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_X); yread = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_Y); pressure = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_PRES); - /* power down digitiser to conserve power */ - //wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET); - //up(&digitiser_sem); - - valid_coords = (xread & 0xfff) && (yread & 0xfff) && (pressure & 0xfff); - - if(valid_coords && (pressure < ptrsh)) { + //valid_coords = (xread & 0xfff) && (yread & 0xfff) && (pressure & 0xfff); + xval = xread & 0xfff; + yval = yread & 0xfff; + valid_coords = (xval) && (yval) && (pressure & 0xfff); + + if(valid_coords && (pressure < ptrsh)) { + if(abs(xval - lastx) <= xdjtrsh){ xval = lastx; } + if(abs(yval - lasty) <= ydjtrsh){ yval = lasty; } btn_pressed = 1; input_report_key(palmld_ac97_input, BTN_TOUCH, 1); - input_report_abs(palmld_ac97_input, ABS_X, xread & 0xfff); - input_report_abs(palmld_ac97_input, ABS_Y, yread & 0xfff); + input_report_abs(palmld_ac97_input, ABS_X, xval); + input_report_abs(palmld_ac97_input, ABS_Y, yval); input_report_abs(palmld_ac97_input, ABS_PRESSURE, pressure & 0xfff); - //printk("x: %d, y=%d, p=%d\n", xread, yread, pressure); input_sync(palmld_ac97_input); + lastx = xval; + lasty = yval; set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/100); @@ -374,6 +382,8 @@ input_report_abs(palmld_ac97_input, ABS_Y, 0); input_report_abs(palmld_ac97_input, ABS_PRESSURE, 0); input_sync(palmld_ac97_input); + lastx = 0; + lasty = 0; } } @@ -390,9 +400,9 @@ if(polarity & levels & WM97XX_GPIO_13) { // power up digitiser: - // test if doing it for all read cycle helps down(&digitiser_sem); wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET_DIG); + palmld_ac97_pendown(dev); /* power down digitiser to conserve power */ @@ -435,9 +445,7 @@ if(!machine_is_xscale_palmtx()) return -ENODEV; - //printk("palmld_ac97_probe: start\n"); - - /* for use by bettery level monitor */ + /* for use by battery level monitor */ palmld_ac97_dev = dev; set_irq_type(IRQ_GPIO_PALMTX_WM9712_IRQ, IRQT_RISING); @@ -453,7 +461,7 @@ ac97->bus->ops->write(ac97, 0x54, 0); /* disable digitiser to save power, enable pen-down detect */ - d2 = ac97->bus->ops->read(ac97, AC97_WM97XX_DIGITISER2); + d2 = DIG2_INIT; d2 |= WM97XX_PRP_DET; d2base = d2; ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); @@ -468,40 +476,24 @@ wm97xx_gpio_mode(ac97, WM97XX_GPIO_13, WM97XX_GPIO_IN, WM97XX_GPIO_POL_HIGH, WM97XX_GPIO_STICKY, WM97XX_GPIO_WAKE); - /* enable ada detect interrupt */ - /* - wm97xx_gpio_mode(ac97, WM97XX_GPIO_12, WM97XX_GPIO_IN, - WM97XX_GPIO_POL_HIGH, WM97XX_GPIO_NOTSTICKY, WM97XX_GPIO_NOWAKE); - */ - /* turn off irq gpio inverting */ ac97->bus->ops->write(ac97, 0x58, ac97->bus->ops->read(ac97, 0x58)&~1); - /* turn on the digitiser and pen down detector */ d2 = ac97->bus->ops->read(ac97, AC97_WM97XX_DIGITISER2); d2 |= WM97XX_PRP_DETW; ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); - // init the digitiser - //d2 = WM97XX_RPR | (1&0x3f); - //d2 |= WM9712_PIL; - - //d2 |= WM97XX_PRP_DETW; - //ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); - - /* setup the input device */ palmld_ac97_input = input_allocate_device(); palmld_ac97_input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); - //palmld_ac97_input->evbit[0] = BIT(EV_ABS); palmld_ac97_input->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); input_set_abs_params(palmld_ac97_input, ABS_X, X_AXIS_MIN, X_AXIS_MAX, 0, 0); input_set_abs_params(palmld_ac97_input, ABS_Y, Y_AXIS_MIN, Y_AXIS_MAX, 0, 0); input_set_abs_params(palmld_ac97_input, ABS_PRESSURE, PRESSURE_MIN, PRESSURE_MAX, 0, 0); - palmld_ac97_input->name = "Palm TX touchscreen (Wolfson WM9712G)"; + palmld_ac97_input->name = "Palm TX touchscreen (Wolfson WM9712)"; palmld_ac97_input->dev = dev; palmld_ac97_input->id.bustype = BUS_HOST; input_register_device(palmld_ac97_input); @@ -514,8 +506,6 @@ palmld_ac97_workqueue = create_workqueue(palmld_ac97_WORK_QUEUE_NAME); INIT_WORK(&palmld_ac97_irq_task, palmld_ac97_irq_work, dev); - - /* register battery */ if(battery_class_register(&palmld_battery)) { @@ -527,7 +517,6 @@ } - //printk("palmld_ac97_probe: end\n"); up(&queue_sem); return 0; } @@ -542,7 +531,7 @@ } static struct device_driver palmld_ac97_driver = { - .name = "WM9712G", + .name = "WM9712", .bus = &ac97_bus_type, .probe = palmld_ac97_probe, .remove = palmld_ac97_remove, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cri...@us...> - 2006-08-20 17:18:05
|
Revision: 553 Author: cristianop Date: 2006-08-20 10:17:41 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=553&view=rev Log Message: ----------- OE: added opie-taskbar - added 320x480 backgrounds (somebody should do them better) - palmtx' qpe.conf Added Paths: ----------- OE/com.hackndev/packages/opie-taskbar/ OE/com.hackndev/packages/opie-taskbar/opie-taskbar/ OE/com.hackndev/packages/opie-taskbar/opie-taskbar/firstuse-320x480.jpg OE/com.hackndev/packages/opie-taskbar/opie-taskbar/opie-background-320x480.jpg OE/com.hackndev/packages/opie-taskbar/opie-taskbar/palmtx/ OE/com.hackndev/packages/opie-taskbar/opie-taskbar/palmtx/qpe.conf OE/com.hackndev/packages/opie-taskbar/opie-taskbar.inc OE/com.hackndev/packages/opie-taskbar/opie-taskbar_1.2.1.bb Added: OE/com.hackndev/packages/opie-taskbar/opie-taskbar/firstuse-320x480.jpg =================================================================== (Binary files differ) Property changes on: OE/com.hackndev/packages/opie-taskbar/opie-taskbar/firstuse-320x480.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: OE/com.hackndev/packages/opie-taskbar/opie-taskbar/opie-background-320x480.jpg =================================================================== (Binary files differ) Property changes on: OE/com.hackndev/packages/opie-taskbar/opie-taskbar/opie-background-320x480.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: OE/com.hackndev/packages/opie-taskbar/opie-taskbar/palmtx/qpe.conf =================================================================== --- OE/com.hackndev/packages/opie-taskbar/opie-taskbar/palmtx/qpe.conf (rev 0) +++ OE/com.hackndev/packages/opie-taskbar/opie-taskbar/palmtx/qpe.conf 2006-08-20 17:17:41 UTC (rev 553) @@ -0,0 +1,18 @@ +[Appearance] +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 10 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 10 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = libphasestyle.so +Text = #000000 +[InputMethod] +current = Multikey Added: OE/com.hackndev/packages/opie-taskbar/opie-taskbar.inc =================================================================== --- OE/com.hackndev/packages/opie-taskbar/opie-taskbar.inc (rev 0) +++ OE/com.hackndev/packages/opie-taskbar/opie-taskbar.inc 2006-08-20 17:17:41 UTC (rev 553) @@ -0,0 +1,107 @@ +DESCRIPTION = "Opie Launcher and Taskbar" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Team Opie <op...@ha...>" +DEPENDS = "opie-libqrsync opie-qss" +APPNAME = "qpe" + +S = "${WORKDIR}/launcher" + +# Caps/Numlock icons for devices with keyboard +EXTRA_QMAKEVARS_POST_append_collie = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_poodle = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_spitz = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" +EXTRA_QMAKEVARS_POST_append_akita = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" + +# Wallpaper and welcome splash +PIXMAP_SIZE = "" +PIXMAP_SIZE_c7x0 = "-640x480" +PIXMAP_SIZE_spitz = "-640x480" +PIXMAP_SIZE_akita = "-640x480" +PIXMAP_SIZE_borzoi = "-640x480" +# PIXMAP_SIZE_tosa = "-640x480" +PIXMAP_SIZE_ipaq-pxa270 = "-480x640" +PIXMAP_SIZE_simpad = "-800x600" +PIXMAP_SIZE_palmtx = "-320x480" + +inherit opie update-rc.d + +INITSCRIPT_NAME = "opie" +INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." + +do_configure_prepend() { + ln -s ${WORKDIR}/calibrate ${S}/calibrate + ln -s ${WORKDIR}/mediummount ${S}/mediummount + install -m 0644 ${WORKDIR}/server.pro ${S}/server.pro + install -m 0644 ${WORKDIR}/firstuse-320x480.jpg ${WORKDIR}/pics/launcher/firstuse-320x480.jpg + install -m 0644 ${WORKDIR}/opie-background-320x480.jpg ${WORKDIR}/pics/launcher/opie-background-320x480.jpg +} + +do_stage() { + install obexinterface.h ${STAGING_INCDIR}/ + +} + +SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings" +PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png" + +do_install() { + install -d ${D}${palmtopdir}/bin + for i in ${SECTIONS} + do + install -d ${D}${palmtopdir}/apps/$i/ + install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/ + done + install -d ${D}${palmtopdir}/pics/launcher + install -d ${D}${palmtopdir}/pics/logo + install -d ${D}${palmtopdir}/pics/RoH/star/ + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/profile.d + install -d ${D}${palmtopdir}/etc/colors + install -d ${D}${palmtopdir}/etc/skel + + install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe + install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/ + install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/ + install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ + + for p in ${PICS} + do + install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p + done + install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg + install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg + + install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/ + install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/ + + install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/ + install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/ + + install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie + install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ + + if [ -s ${WORKDIR}/locale.conf ]; then + install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ + fi + + install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/ + install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/ +} + +updatercd_postinst_mnci() { +if test "x$D" != "x"; then + D="-r $D" +else + D="" # do not autostart at installation time +fi +update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} +} + +FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics" + +PACKAGE_ARCH = "${MACHINE_ARCH}" Added: OE/com.hackndev/packages/opie-taskbar/opie-taskbar_1.2.1.bb =================================================================== --- OE/com.hackndev/packages/opie-taskbar/opie-taskbar_1.2.1.bb (rev 0) +++ OE/com.hackndev/packages/opie-taskbar/opie-taskbar_1.2.1.bb 2006-08-20 17:17:41 UTC (rev 553) @@ -0,0 +1,21 @@ +include ${PN}.inc + +PR = "r1" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/root \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ + file://nomax.patch;patch=1;pnum=3 \ + file://server.pro \ + file://opie-reorgfiles \ + file://opie \ + file://qpe.conf \ + file://locale.conf \ + file://opie_defaults \ + file://firstuse-320x480.jpg \ + file://opie-background-320x480.jpg" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-20 13:03:08
|
Revision: 552 Author: bobofdoom Date: 2006-08-20 06:03:01 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=552&view=rev Log Message: ----------- t3: Removed spurious __init and __exit qualifiers. Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2006-08-20 12:38:11 UTC (rev 551) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2006-08-20 13:03:01 UTC (rev 552) @@ -220,7 +220,7 @@ } } -static int __init palmt3_btn_probe(struct device *dev) +static int palmt3_btn_probe(struct device *dev) { unsigned long flags, ret; DBG("Probing device\n" ); @@ -287,7 +287,7 @@ return 0; } -static int __exit palmt3_btn_remove (struct device *dev) +static int palmt3_btn_remove (struct device *dev) { DBG("removing device...\n"); destroy_workqueue(palmt3_workqueue); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <far...@us...> - 2006-08-20 12:38:18
|
Revision: 551 Author: farcaller Date: 2006-08-20 05:38:11 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=551&view=rev Log Message: ----------- palmt3: TSC2101 driver requires PXA2xx I2Sound Modified Paths: -------------- linux4palm/linux/trunk/drivers/soc/Kconfig Modified: linux4palm/linux/trunk/drivers/soc/Kconfig =================================================================== --- linux4palm/linux/trunk/drivers/soc/Kconfig 2006-08-20 12:36:28 UTC (rev 550) +++ linux4palm/linux/trunk/drivers/soc/Kconfig 2006-08-20 12:38:11 UTC (rev 551) @@ -66,6 +66,7 @@ config SOC_TSC2101 tristate "Support for TI TSC2101 Touchscreen and Audio Codec" depends on TOUCHSCREEN_TSC2101 + select SND_PXA2xx_I2SOUND help Support for TI TSC2101 Touchscreen and Audio Codec This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <far...@us...> - 2006-08-20 12:36:38
|
Revision: 550 Author: farcaller Date: 2006-08-20 05:36:28 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=550&view=rev Log Message: ----------- palmt3: fixed MTD_WRITEABLE mask for PalmOS partitions Modified Paths: -------------- linux4palm/linux/trunk/drivers/mtd/maps/palmt3-flash.c Modified: linux4palm/linux/trunk/drivers/mtd/maps/palmt3-flash.c =================================================================== --- linux4palm/linux/trunk/drivers/mtd/maps/palmt3-flash.c 2006-08-20 12:35:24 UTC (rev 549) +++ linux4palm/linux/trunk/drivers/mtd/maps/palmt3-flash.c 2006-08-20 12:36:28 UTC (rev 550) @@ -39,20 +39,20 @@ .size = 0x40000, // 256kb .offset = 0, // .mask_flags = MTD_WRITEABLE + .mask_flags = MTD_WRITEABLE, },{ .name = "BigROM", .size = 0xf00000, // 16mb - 256kb(smallrom) - 256kb - 512kb .offset = 0x40000, + .mask_flags = MTD_WRITEABLE, },{ .name = "lin256k", .size = 0x40000, .offset = 0xf40000, - .mask_flags = MTD_WRITEABLE, },{ .name = "lin512k", .size = MTDPART_SIZ_FULL, .offset = MTDPART_OFS_APPEND, - .mask_flags = MTD_WRITEABLE } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <far...@us...> - 2006-08-20 12:35:33
|
Revision: 549 Author: farcaller Date: 2006-08-20 05:35:24 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=549&view=rev Log Message: ----------- plamt3: T3 PM code, not working, mostly debug stubs Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c linux4palm/linux/trunk/arch/arm/mach-pxa/pxa25x.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c 2006-08-20 12:31:41 UTC (rev 548) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3.c 2006-08-20 12:35:24 UTC (rev 549) @@ -28,6 +28,7 @@ #include <asm/arch/ssp.h> #include <linux/input.h> #include <linux/soc/tsc2101.h> +#include <asm/arch/pxa-pm_ll.h> #include "../generic.h" @@ -156,6 +157,51 @@ .id = -1, }; +/*** Suspend/Resume ***/ +void palmt3_suspend(unsigned long ret) +{ + // TODO: store return address in checkpoint mem + // INFO: check arch/arm/mach-pxa/pm.c and pxa25x.c for more info + unsigned long * addr; + addr = 0xC0000FF0; + *addr = 0; + addr = 0xC0000FF4; + *addr = 0; + addr = 0xC0000FF8; + *addr = 0; + + return; +} + +void palmt3_suspend_prepare(void) +{ + unsigned long * addr; + PSPR = 0x8C000F00; + PWER = 0x0C03; + PRER = 0x0C03; + PFER = 0x0C03; +#if 0 + addr = 0xC0004800; + *addr = 0x0000000A; +#endif + addr = 0xC0000FF4; + *addr = 0xfeedbee1; +} + +void palmt3_resume(void) +{ + // TODO: anything here? + unsigned long * addr; + addr = 0xC0000FF8; + *addr = 0xfeedbee3; +} + +static struct pxa_ll_pm_ops palmt3_pm_ops = { + palmt3_suspend, + palmt3_resume +}; + + /*** INIT ***/ static struct platform_device *devices[] __initdata = { @@ -173,7 +219,7 @@ do { GPSR(85) = GPIO_bit(85); } while (0); */ set_pxa_fb_info(&palmt3lcd); - + pxa_pm_set_ll_ops(&palmt3_pm_ops); palmt3_ssp_init(); platform_add_devices (devices, ARRAY_SIZE (devices)); } Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/pxa25x.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/pxa25x.c 2006-08-20 12:31:41 UTC (rev 548) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/pxa25x.c 2006-08-20 12:35:24 UTC (rev 549) @@ -122,13 +122,20 @@ { extern void pxa_cpu_suspend(unsigned int); extern void pxa_cpu_resume(void); +#ifdef CONFIG_MACH_T3XSCALE + extern void palmt3_suspend_prepare(void); +#endif CKEN = 0; switch (state) { case PM_SUSPEND_MEM: /* set resume return address */ +#ifndef CONFIG_MACH_T3XSCALE PSPR = virt_to_phys(pxa_cpu_resume); +#else + palmt3_suspend_prepare(); +#endif pxa_cpu_suspend(PWRMODE_SLEEP); break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <far...@us...> - 2006-08-20 12:31:48
|
Revision: 548 Author: farcaller Date: 2006-08-20 05:31:41 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=548&view=rev Log Message: ----------- palmt3: fixed typo Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/Kconfig Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/Kconfig =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/Kconfig 2006-08-20 12:30:49 UTC (rev 547) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/Kconfig 2006-08-20 12:31:41 UTC (rev 548) @@ -19,6 +19,6 @@ config PALM_T3_FBKEYBOARD bool "On-screen keyboard (BROKEN)" - depends on PALM_T3_TSC2101 + depends on PALM_T3_TSC2101 help On-screen framebuffer keyboard This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <far...@us...> - 2006-08-20 12:30:57
|
Revision: 547 Author: farcaller Date: 2006-08-20 05:30:49 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=547&view=rev Log Message: ----------- palmt3: small changes in T3's hw buttons configuration Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2006-08-20 12:27:38 UTC (rev 546) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt3/palmt3_buttons.c 2006-08-20 12:30:49 UTC (rev 547) @@ -53,8 +53,8 @@ #define T3BTN_TODO 8 #define T3BTN_CENTER 9 -#define T3KEY_CALENDAR KEY_ENTER -#define T3KEY_VOICE KEY_V +#define T3KEY_CALENDAR KEY_SPACE +#define T3KEY_VOICE KEY_TAB #define T3KEY_CONTACT KEY_C #define T3KEY_UP KEY_UP #define T3KEY_DOWN KEY_DOWN @@ -62,7 +62,7 @@ #define T3KEY_RIGHT KEY_RIGHT #define T3KEY_MEMO KEY_M #define T3KEY_TODO KEY_T -#define T3KEY_CENTER KEY_SPACE +#define T3KEY_CENTER KEY_ENTER #define T3SLIDER_OPEN KEY_O #define T3SLIDER_CLOSE KEY_P This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <far...@us...> - 2006-08-20 12:27:51
|
Revision: 546 Author: farcaller Date: 2006-08-20 05:27:38 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=546&view=rev Log Message: ----------- l4p: SMALLOOPS config option to suppress most of oops output Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/kernel/traps.c linux4palm/linux/trunk/lib/Kconfig.debug Modified: linux4palm/linux/trunk/arch/arm/kernel/traps.c =================================================================== --- linux4palm/linux/trunk/arch/arm/kernel/traps.c 2006-08-15 12:52:32 UTC (rev 545) +++ linux4palm/linux/trunk/arch/arm/kernel/traps.c 2006-08-20 12:27:38 UTC (rev 546) @@ -204,7 +204,7 @@ { struct task_struct *tsk = thread->task; static int die_counter; - +#ifdef CONFIG_SMALLOOPS printk("Internal error: %s: %x [#%d]\n", str, err, ++die_counter); print_modules(); __show_regs(regs); @@ -217,6 +217,7 @@ dump_backtrace(regs, tsk); dump_instr(regs); } +#endif } DEFINE_SPINLOCK(die_lock); Modified: linux4palm/linux/trunk/lib/Kconfig.debug =================================================================== --- linux4palm/linux/trunk/lib/Kconfig.debug 2006-08-15 12:52:32 UTC (rev 545) +++ linux4palm/linux/trunk/lib/Kconfig.debug 2006-08-20 12:27:38 UTC (rev 546) @@ -23,6 +23,11 @@ keys are documented in <file:Documentation/sysrq.txt>. Don't say Y unless you really know what this hack does. +config SMALLOOPS + bool "Small oops output" + help + Supresses most of oops output + config DEBUG_KERNEL bool "Kernel debugging" help This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-15 12:52:41
|
Revision: 545 Author: bobofdoom Date: 2006-08-15 05:52:32 -0700 (Tue, 15 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=545&view=rev Log Message: ----------- OE: Familiar setup script with LD and TX options. Added Paths: ----------- OE/com.hackndev/setup/ OE/com.hackndev/setup/build-env.sh Added: OE/com.hackndev/setup/build-env.sh =================================================================== --- OE/com.hackndev/setup/build-env.sh (rev 0) +++ OE/com.hackndev/setup/build-env.sh 2006-08-15 12:52:32 UTC (rev 545) @@ -0,0 +1,195 @@ +#!/bin/sh + +# Familiar Build Setup Script +# +# Copyright (C) 2006 Rene Wagner <rw...@ha...> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +BASE_TITLE="Familiar Build Setup:" +FAMILIAR_RELEASE="0.8.4" + +fatal() { + echo "Fatal: $1" + exit 1 +} + +error() { + zenity --error --text="$1" +} + +abort() { + zenity --info --text="Setup aborted." + exit 1 +} + +which zenity > /dev/null || fatal "You must have zenity installed." + +BASE_DIR=${PWD} +while [ ! -d ${BASE_DIR}/org.handhelds.familiar ]; do + BASE_DIR=`zenity --file-selection --directory --filename=${BASE_DIR} --title="${BASE_TITLE} Select Build Tree Base Directory"` + case $? in + 0) + if [ ! -d ${BASE_DIR}/org.handhelds.familiar ]; then + error "Does not look like a Familiar build tree: ${BASE_DIR}" + fi + ;; + 1) + abort;; + -1) + abort;; + esac +done + +DL_DIR="${BASE_DIR}/downloads" +DL_DIR=`zenity --entry \ + --title="${BASE_TITLE} Downloads Directory" \ + --text="Where do you want downloaded files to be stored?" \ + --entry-text="${DL_DIR}"` +case $? in + 1) + abort;; + -1) + abort;; +esac + +while [ -z "$MACHINE" ]; do +MACHINE=`zenity --list \ + --height=280 \ + --title="${BASE_TITLE} Target Machine" \ + --text="Select a target machine type from the list below:" \ + --column="Name" --column="Description" \ + "h3600" "HP iPAQ h36xx/h37xx/h38xx Series" \ + "h3900" "HP iPAQ h39xx/h51xx/h54xx/h55xx Series" \ + "h2200" "HP iPAQ h22xx Series" \ + "ipaq-pxa270" "HP iPAQ hx4700 Series" \ + "h6300" "HP iPAQ h63xx Series" \ + "palmtx" "Palm TX" \ + "palmld" "Palm LifeDrive"` +case $? in + 0) + if [ -z "$MACHINE" ]; then + error "Please select a target machine." + fi + ;; + 1) + abort;; + -1) + abort;; +esac +done + +while [ -z "$GRAPHICAL_ENV" ]; do +GRAPHICAL_ENV=`zenity --list \ + --height=280 \ + --title="${BASE_TITLE} Primary Graphical Environment" \ + --text="Select the graphical environment you want to build for from the list below:" \ + --column="Name" --column="Description" \ + "gpe" "The GPE Palmtop Environment. X11 based." \ + "opie" "The Open Palmtop Integrated Environment. Qt/Embedded based." \ + "any" "No preference. This may break certain things."` +case $? in + 0) + if [ -z "$GRAPHICAL_ENV" ]; then + error "Please select a graphical environment." + fi + ;; + 1) + abort;; + -1) + abort;; +esac +done + +BUILD_DIR="${BASE_DIR}/build-${MACHINE}-${GRAPHICAL_ENV}" +while true; do + BUILD_DIR=`zenity --entry \ + --title="${BASE_TITLE} Build Directory" \ + --text="A build directory will be created for the configuration you selected at the following location:" \ + --entry-text="${BUILD_DIR}"` + case $? in + 1) + abort;; + -1) + abort;; + esac + if [ -z ${BUILD_DIR} ]; then + error "Please specify a build directory." + continue + fi + if [ -d ${BUILD_DIR} ]; then + error "${BUILD_DIR} exists." + continue + fi + + break +done + +mkdir -p ${BUILD_DIR}/conf +CONFFILE="${BUILD_DIR}/conf/auto.conf" +cat > ${CONFFILE} <<EOF +# Auto-generated Familiar Build Configuration + +DISTRO="familiar-${FAMILIAR_RELEASE}" + +# where to store downloaded files +DL_DIR = "${DL_DIR}" + +# list of .bb files as a shell glob +BBFILES = "${BASE_DIR}/org.handhelds.familiar/packages/*/*bb" + +# top level build directory for this configuration +TOPDIR = "${BUILD_DIR}" + +# target MACHINE +MACHINE = "${MACHINE}" + +EOF + +if [ "${GRAPHICAL_ENV}" == "gpe" ]; then +cat >> ${CONFFILE} <<EOF +# X11 specific settings +PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11" + +EOF +elif [ "${GRAPHICAL_ENV}" == "opie" ]; then +cat >> ${CONFFILE} <<EOF +# Opie specific settings +PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe" + +EOF +fi + +ENVSCRIPT="${BUILD_DIR}/conf/env.sh" +cat > ${ENVSCRIPT} <<EOF +PATH="${BASE_DIR}/bitbake/bin:${PATH}" +BBPATH="${BUILD_DIR}:${BASE_DIR}/org.handhelds.familiar" + +export PATH BBPATH +EOF + +zenity --info \ + --title="${BASE_TITLE} Setup Complete" \ + --text="Your configuration was written to ${CONFFILE}. It will be displayed after this dialog. Please verify that all settings are correct. To re-start the setup please delete the build directory and re-run the setup tool." + +zenity --text-info \ + --width=600 --height=400 \ + --title="${BASE_TITLE} Configuration Written to ${CONFFILE}" \ + --filename="${CONFFILE}" + +zenity --info \ + --title="${BASE_TITLE} Running a Build" \ + --text="Please run the following command before attempting to run a build: \"$ source ${ENVSCRIPT}\". It will configure the environment so you can run bitbake." Property changes on: OE/com.hackndev/setup/build-env.sh ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cri...@us...> - 2006-08-13 17:46:07
|
Revision: 544 Author: cristianop Date: 2006-08-13 10:45:49 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=544&view=rev Log Message: ----------- linux4palm: some changes to prevent read errors ... Modified Paths: -------------- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c =================================================================== --- linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-13 16:07:50 UTC (rev 543) +++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmtx/palmld_ac97.c 2006-08-13 17:45:49 UTC (rev 544) @@ -47,6 +47,7 @@ #define WM9712_PIL 0x00100 #define WM97XX_POLL 0x8000 /* initiate a polling measurement */ #define AC97_LINK_FRAME 21 /* time in uS for AC97 link frame */ +#define WM97XX_DELAY(i) ((i << 4) & 0x00f0) /* sample delay times */ #define DEFAULT_PRESSURE_TRESHOLD 45160 /* default pressure treshold for pen up/down */ @@ -76,6 +77,7 @@ static unsigned long last_update = 0; static int battery_voltage; static int previous_voltage; +static u16 d2base; #if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) /* original APM hook */ @@ -133,19 +135,13 @@ ac97->bus->ops->write(ac97, 0x52, GWn); } -static int wm97xx_set_digitiser_power(struct device *dev, int value) +static void wm97xx_set_digitiser_power(struct device *dev, int value) { ac97_t *ac97 = dev->platform_data; - u16 d2; + u16 d2 = d2base; - d2 = ac97->bus->ops->read(ac97, AC97_WM97XX_DIGITISER2); - if (d2 == (unsigned short) -1){ - printk("wm9712: will not set digitizer to %d due to read error on 0x78\n", value); - return -1; - } d2 |= value; ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); - return 1; } /* @@ -159,24 +155,19 @@ static int palmld_ac97_take_reading(struct device *dev, int adcsel) { ac97_t *ac97 = dev->platform_data; - int timeout = 10; - u16 r76, r7a; + int timeout = 15; + u16 r76 = 0; + u16 r7a; - r76 = ac97->bus->ops->read(ac97, 0x76); - if (r76 == (unsigned short) -1){ - printk("wm9712: will not continue take reading due to read error on 0x76\n"); - return 0; - } - - r76 &= ~WM97XX_ADCSEL_MASK; /* clear ADCSEL */ r76 |= adcsel; /* set ADCSEL */ + r76 |= WM97XX_DELAY(3); /* set DELAY */ r76 &= ~(1<<11); /* COO = 0 (single measurement) */ r76 &= ~(1<<10); /* CTC = 0 (polling mode) */ - r76 |= (1<<15); /* start reading */ + r76 |= (1<<15); /* start reading */ ac97->bus->ops->write(ac97, 0x76, r76); // some code from the the wolfson' driver - udelay (3 * AC97_LINK_FRAME + 167); + udelay ((3 * AC97_LINK_FRAME) + 167); /* wait for POLL to go low */ @@ -215,23 +206,16 @@ return; down(&digitiser_sem); - //wm97xx_set_digitiser_power(palmld_ac97_dev, WM97XX_PRP_DET_DIG); - if (wm97xx_set_digitiser_power(palmld_ac97_dev, WM97XX_PRP_DET_DIG)){ - // todo: check if reading is valid - reading = palmld_ac97_take_reading(palmld_ac97_dev, WM97XX_ADCSEL_BMON); - wm97xx_set_digitiser_power(palmld_ac97_dev, WM97XX_PRP_DET); - up(&digitiser_sem); - previous_voltage = battery_voltage; - battery_voltage = reading & 0xfff; - //printk("wm9712: battery -> %d\n", battery_voltage); - last_update = jiffies; - } - else { - up(&digitiser_sem); - printk ("wm9712: couldn't power digitiser on ... skipping battery read\n"); - - } + wm97xx_set_digitiser_power(palmld_ac97_dev, WM97XX_PRP_DET_DIG); + // todo: check if reading is valid + reading = palmld_ac97_take_reading(palmld_ac97_dev, WM97XX_ADCSEL_BMON); + wm97xx_set_digitiser_power(palmld_ac97_dev, WM97XX_PRP_DET); + up(&digitiser_sem); + previous_voltage = battery_voltage; + battery_voltage = reading & 0xfff; + //printk("wm9712: battery -> %d\n", battery_voltage); + last_update = jiffies; up(&battery_update_mutex); } @@ -358,11 +342,8 @@ //wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET_DIG); /* take readings */ - //printk("wm9712: reading x\n"); xread = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_X); - //printk("wm9712: reading y\n"); yread = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_Y); - //printk("wm9712: reading pressure\n"); pressure = palmld_ac97_take_reading(dev, WM97XX_ADCSEL_PRES); /* power down digitiser to conserve power */ @@ -404,55 +385,30 @@ u16 levels; u16 polarity; - - //printk ("wm97xx: disabling pen detect interrupt\n"); - // disable pen detect interrupt - //wm97xx_gpio_mode(ac97, WM97XX_GPIO_13, WM97XX_GPIO_IN, - // WM97XX_GPIO_POL_HIGH, WM97XX_GPIO_NOTSTICKY, WM97XX_GPIO_NOWAKE); - //printk ("wm97xx: pen detect interrupt disabled\n"); - - levels = ac97->bus->ops->read(ac97, 0x54); polarity = ac97->bus->ops->read(ac97, 0x4e); if(polarity & levels & WM97XX_GPIO_13) { - //printk("wm9712: starting read\n"); - down(&digitiser_sem); // power up digitiser: - // test if doing it for all read cycle has benefits to ac97 usage - - - if (wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET_DIG)){ - palmld_ac97_pendown(dev); - /* power down digitiser to conserve power */ - wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET); - } - else{ - printk("wm9712: cannot power digitizer on ... skipping pendown reading\n"); - } - ac97->bus->ops->write(ac97, 0x4e, polarity & ~WM97XX_GPIO_13); + // test if doing it for all read cycle helps + down(&digitiser_sem); + wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET_DIG); + palmld_ac97_pendown(dev); + /* power down digitiser to conserve power */ + wm97xx_set_digitiser_power(dev, WM97XX_PRP_DET); + ac97->bus->ops->write(ac97, 0x4e, polarity & ~WM97XX_GPIO_13); up(&digitiser_sem); } else { ac97->bus->ops->write(ac97, 0x4e, polarity | WM97XX_GPIO_13); } - ac97->bus->ops->write(ac97, 0x54, levels & ~WM97XX_GPIO_13); - - - //printk ("wm97xx: re-enabling pen detect interrupt\n"); - /* re-enable pen detect interrupt */ - - //wm97xx_gpio_mode(ac97, WM97XX_GPIO_13, WM97XX_GPIO_IN, - // WM97XX_GPIO_POL_HIGH, WM97XX_GPIO_STICKY, WM97XX_GPIO_WAKE); - //printk ("wm97xx: re-enabled pen detect interrupt\n"); - udelay(50); + udelay(1); up(&queue_sem); enable_irq(IRQ_GPIO_PALMTX_WM9712_IRQ); - } static irqreturn_t palmld_ac97_irq_handler(int irq, void *dev_id, struct pt_regs *regs) @@ -461,20 +417,10 @@ * we can't use ac97 from within the interrupt handler, so schedule a task * to do the actual handling. */ - //printk("wm9712: IRQ request received\n"); - // probably this lock is useless as irq seems to be disabled so quickly that - // I haven't seen up until now requests not queued if (down_trylock(&queue_sem) == 0){ disable_irq(IRQ_GPIO_PALMTX_WM9712_IRQ); queue_work(palmld_ac97_workqueue, &palmld_ac97_irq_task); - //printk("wm9712: IRQ request queued\n"); } - //else{ - // printk("wm9712: IRQ request not queued\n"); - //} - - - return IRQ_HANDLED; } @@ -509,6 +455,7 @@ /* disable digitiser to save power, enable pen-down detect */ d2 = ac97->bus->ops->read(ac97, AC97_WM97XX_DIGITISER2); d2 |= WM97XX_PRP_DET; + d2base = d2; ac97->bus->ops->write(ac97, AC97_WM97XX_DIGITISER2, d2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-10 03:42:23
|
Revision: 542 Author: bobofdoom Date: 2006-08-09 20:42:18 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=542&view=rev Log Message: ----------- initramfs: Makefile now builds cpio image. Modified Paths: -------------- linux4palm/initramfs/Makefile Modified: linux4palm/initramfs/Makefile =================================================================== --- linux4palm/initramfs/Makefile 2006-08-09 13:46:40 UTC (rev 541) +++ linux4palm/initramfs/Makefile 2006-08-10 03:42:18 UTC (rev 542) @@ -13,7 +13,7 @@ # only use this option if fakeroot is not available. SUDO?= -all: ${OUTDIR}/bin/busybox ${OUTDIR}/dev/ chown +all: initramfs_data.cpio.gz ${BBTAR}: echo Fetching ${BBTAR}... press Ctrl+C to cancel. @@ -28,12 +28,13 @@ cp -R base ${OUTDIR} touch ${OUTDIR} + rm -Rf ${OUTDIR}/.svn mkdir -p ${OUTDIR}/lib/modules ${OUTDIR}/mdeia/mmc1 mkdir -p ${OUTDIR}/mnt/mmc ${OUTDIR}/mnt/hda mkdir -p ${OUTDIR}/newroot ${OUTDIR}/proc ${OUTDIR}/root mkdir -p ${OUTDIR}/sys ${OUTDIR}/tmp -${OUTDIR}/dev/: ${OUTDIR}/ device-nodes.tar.gz +${OUTDIR}/dev/: checkroot ${OUTDIR}/ device-nodes.tar.gz ${SUDO} tar -zxpf device-nodes.tar.gz -C ${OUTDIR}/ ${OUTDIR}/bin/busybox: ${BBSRC}/ ${OUTDIR}/ busybox.config @@ -41,9 +42,18 @@ make -C ${BBSRC} ${SUDO} make -C ${BBSRC} install PREFIX=`pwd`/${OUTDIR} -chown: ${OUTDIR}/ ${OUTDIR}/bin/busybox +initramfs_data.cpio: ${OUTDIR}/bin/busybox ${OUTDIR}/dev/ chown + (cd ${OUTDIR}; find . | cpio -o -H newc) > initramfs_data.cpio + +initramfs_data.cpio.gz: initramfs_data.cpio + cat initramfs_data.cpio | gzip > initramfs_data.cpio.gz + +chown: checkroot ${OUTDIR}/ ${OUTDIR}/bin/busybox ${SUDO} chown -R 0:0 ${OUTDIR}/ clean: ${SUDO} rm -Rf ${OUTDIR} rm -Rf ${BBSRC} + +checkroot: + if [ `id -u` -ne 0 ]; then echo Please run make using fakeroot.; exit 1; fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-09 13:46:49
|
Revision: 541 Author: bobofdoom Date: 2006-08-09 06:46:40 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=541&view=rev Log Message: ----------- initramfs: fixed typos in init. Modified Paths: -------------- linux4palm/initramfs/Makefile linux4palm/initramfs/base/init Modified: linux4palm/initramfs/Makefile =================================================================== --- linux4palm/initramfs/Makefile 2006-08-09 12:57:21 UTC (rev 540) +++ linux4palm/initramfs/Makefile 2006-08-09 13:46:40 UTC (rev 541) @@ -24,7 +24,7 @@ tar -jxf ${BBTAR} touch ${BBSRC} -${OUTDIR}/: base/* base/*/* +${OUTDIR}/: base/* base/*/* base/init cp -R base ${OUTDIR} touch ${OUTDIR} @@ -36,7 +36,7 @@ ${OUTDIR}/dev/: ${OUTDIR}/ device-nodes.tar.gz ${SUDO} tar -zxpf device-nodes.tar.gz -C ${OUTDIR}/ -${OUTDIR}/bin/busybox: ${BBSRC}/ ${OURDIR}/ busybox.config +${OUTDIR}/bin/busybox: ${BBSRC}/ ${OUTDIR}/ busybox.config cp busybox.config ${BBSRC}/.config make -C ${BBSRC} ${SUDO} make -C ${BBSRC} install PREFIX=`pwd`/${OUTDIR} Modified: linux4palm/initramfs/base/init =================================================================== --- linux4palm/initramfs/base/init 2006-08-09 12:57:21 UTC (rev 540) +++ linux4palm/initramfs/base/init 2006-08-09 13:46:40 UTC (rev 541) @@ -42,7 +42,7 @@ #mount -n -t proc /proc mount -n -t proc none /proc >/dev/null 2>&1 || mount -t proc none /proc -if grep -q /proc/cpuinfo LifeDrive; thena +if grep -q LifeDrive /proc/cpuinfo; then echo Mounting LifeDrive data partition... losetup -o $HDD_OFFSET $LOOP_DEV $HDD_DEV FILES_DEV=$LOOP_DEV This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-09 12:57:31
|
Revision: 540 Author: bobofdoom Date: 2006-08-09 05:57:21 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=540&view=rev Log Message: ----------- initramfs: Using fakeroot instead of sudo. Modified Paths: -------------- linux4palm/initramfs/Makefile linux4palm/initramfs/base/init linux4palm/initramfs/busybox.config Modified: linux4palm/initramfs/Makefile =================================================================== --- linux4palm/initramfs/Makefile 2006-08-09 11:45:16 UTC (rev 539) +++ linux4palm/initramfs/Makefile 2006-08-09 12:57:21 UTC (rev 540) @@ -1,9 +1,8 @@ # # Builds a Hack&Dev initramfs tree # -# Unfortunately AFAICT we need to use sudo for dealing with the device -# nodes. -# +# Call this from within a fakeroot session. +# OUTDIR?=build @@ -11,6 +10,9 @@ BBTAR?=${BBSRC}.tar.bz2 BBURL?="http://www.busybox.net/downloads/${BBTAR}" +# only use this option if fakeroot is not available. +SUDO?= + all: ${OUTDIR}/bin/busybox ${OUTDIR}/dev/ chown ${BBTAR}: @@ -31,17 +33,17 @@ mkdir -p ${OUTDIR}/newroot ${OUTDIR}/proc ${OUTDIR}/root mkdir -p ${OUTDIR}/sys ${OUTDIR}/tmp -${OUTDIR}/dev/: ${OUTDIR} device-nodes.tar.gz - sudo tar -zxpf device-nodes.tar.gz -C ${OUTDIR}/ +${OUTDIR}/dev/: ${OUTDIR}/ device-nodes.tar.gz + ${SUDO} tar -zxpf device-nodes.tar.gz -C ${OUTDIR}/ ${OUTDIR}/bin/busybox: ${BBSRC}/ ${OURDIR}/ busybox.config cp busybox.config ${BBSRC}/.config make -C ${BBSRC} - make -C ${BBSRC} install PREFIX=`pwd`/${OUTDIR} + ${SUDO} make -C ${BBSRC} install PREFIX=`pwd`/${OUTDIR} chown: ${OUTDIR}/ ${OUTDIR}/bin/busybox - sudo chown -R 0:0 ${OUTDIR}/ + ${SUDO} chown -R 0:0 ${OUTDIR}/ clean: - sudo rm -Rf ${OUTDIR} + ${SUDO} rm -Rf ${OUTDIR} rm -Rf ${BBSRC} Modified: linux4palm/initramfs/base/init =================================================================== --- linux4palm/initramfs/base/init 2006-08-09 11:45:16 UTC (rev 539) +++ linux4palm/initramfs/base/init 2006-08-09 12:57:21 UTC (rev 540) @@ -18,9 +18,14 @@ MODULES_DIR="/lib/modules" POST_MODULES_SCRIPT="" +# LifeDrive-specific options +HDD_DEV=/dev/hda +HDD_OFFSET=91814912 +LOOP_DEV=/dev/loop0 + + echo initram init started - if [ -f /etc/modules.initrd ]; then echo loading initial modules cat /etc/modules.initrd | while read module; do @@ -37,6 +42,13 @@ #mount -n -t proc /proc mount -n -t proc none /proc >/dev/null 2>&1 || mount -t proc none /proc +if grep -q /proc/cpuinfo LifeDrive; thena + echo Mounting LifeDrive data partition... + losetup -o $HDD_OFFSET $LOOP_DEV $HDD_DEV + FILES_DEV=$LOOP_DEV + FILES_MNT=/mnt/hda +fi + if [ -b $FILES_DEV ]; then echo -n "linux.boot.cfg on $FILES_DEV: " /bin/mount -n -t vfat -o rw $FILES_DEV $FILES_MNT @@ -58,7 +70,7 @@ echo not found. fi else - echo fat16 partition not found. + echo fat32 partition not found. fi Modified: linux4palm/initramfs/busybox.config =================================================================== --- linux4palm/initramfs/busybox.config 2006-08-09 11:45:16 UTC (rev 539) +++ linux4palm/initramfs/busybox.config 2006-08-09 12:57:21 UTC (rev 540) @@ -580,11 +580,11 @@ # # Shells # -# CONFIG_FEATURE_SH_IS_ASH is not set +CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_LASH is not set # CONFIG_FEATURE_SH_IS_MSH is not set -CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-09 11:45:28
|
Revision: 539 Author: bobofdoom Date: 2006-08-09 04:45:16 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=539&view=rev Log Message: ----------- initramfs: Added build scripts. Modified Paths: -------------- linux4palm/initramfs/Makefile Added Paths: ----------- linux4palm/initramfs/base/ linux4palm/initramfs/busybox.config linux4palm/initramfs/device-nodes.tar.gz Removed Paths: ------------- linux4palm/initramfs/files/ Modified: linux4palm/initramfs/Makefile =================================================================== --- linux4palm/initramfs/Makefile 2006-08-09 09:12:25 UTC (rev 538) +++ linux4palm/initramfs/Makefile 2006-08-09 11:45:16 UTC (rev 539) @@ -1,3 +1,47 @@ -# TODO; -# Build an initramfs image from busybox source. -# Using klibc if possible for nice smallness. +# +# Builds a Hack&Dev initramfs tree +# +# Unfortunately AFAICT we need to use sudo for dealing with the device +# nodes. +# + +OUTDIR?=build + +BBSRC?=busybox-1.2.1 +BBTAR?=${BBSRC}.tar.bz2 +BBURL?="http://www.busybox.net/downloads/${BBTAR}" + +all: ${OUTDIR}/bin/busybox ${OUTDIR}/dev/ chown + +${BBTAR}: + echo Fetching ${BBTAR}... press Ctrl+C to cancel. + sleep 5 + wget -c ${BBURL} + +${BBSRC}/: ${BBTAR} + tar -jxf ${BBTAR} + touch ${BBSRC} + +${OUTDIR}/: base/* base/*/* + cp -R base ${OUTDIR} + touch ${OUTDIR} + + mkdir -p ${OUTDIR}/lib/modules ${OUTDIR}/mdeia/mmc1 + mkdir -p ${OUTDIR}/mnt/mmc ${OUTDIR}/mnt/hda + mkdir -p ${OUTDIR}/newroot ${OUTDIR}/proc ${OUTDIR}/root + mkdir -p ${OUTDIR}/sys ${OUTDIR}/tmp + +${OUTDIR}/dev/: ${OUTDIR} device-nodes.tar.gz + sudo tar -zxpf device-nodes.tar.gz -C ${OUTDIR}/ + +${OUTDIR}/bin/busybox: ${BBSRC}/ ${OURDIR}/ busybox.config + cp busybox.config ${BBSRC}/.config + make -C ${BBSRC} + make -C ${BBSRC} install PREFIX=`pwd`/${OUTDIR} + +chown: ${OUTDIR}/ ${OUTDIR}/bin/busybox + sudo chown -R 0:0 ${OUTDIR}/ + +clean: + sudo rm -Rf ${OUTDIR} + rm -Rf ${BBSRC} Copied: linux4palm/initramfs/base (from rev 537, linux4palm/initramfs/files) Added: linux4palm/initramfs/busybox.config =================================================================== --- linux4palm/initramfs/busybox.config (rev 0) +++ linux4palm/initramfs/busybox.config 2006-08-09 11:45:16 UTC (rev 539) @@ -0,0 +1,635 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +CONFIG_STATIC=y +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +# CONFIG_LFS is not set +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-unknown-linux-uclibc-" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +# CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_BUNZIP2 is not set +# CONFIG_CPIO is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +# CONFIG_GUNZIP is not set +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +# CONFIG_GZIP is not set +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_TAR is not set +# CONFIG_FEATURE_TAR_CREATE is not set +# CONFIG_FEATURE_TAR_BZIP2 is not set +# CONFIG_FEATURE_TAR_LZMA is not set +# CONFIG_FEATURE_TAR_FROM is not set +# CONFIG_FEATURE_TAR_GZIP is not set +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_UNZIP is not set +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +# CONFIG_BASENAME is not set +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +# CONFIG_CHGRP is not set +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +# CONFIG_CUT is not set +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +# CONFIG_DF is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_BINARY is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_DIRNAME is not set +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +# CONFIG_DU is not set +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +# CONFIG_ENV is not set +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +# CONFIG_EXPR is not set +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +# CONFIG_HEAD is not set +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +# CONFIG_LN is not set +# CONFIG_LOGNAME is not set +CONFIG_LS=y +# CONFIG_FEATURE_LS_FILETYPES is not set +# CONFIG_FEATURE_LS_FOLLOWLINKS is not set +# CONFIG_FEATURE_LS_RECURSIVE is not set +# CONFIG_FEATURE_LS_SORTFILES is not set +# CONFIG_FEATURE_LS_TIMESTAMPS is not set +# CONFIG_FEATURE_LS_USERNAME is not set +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +# CONFIG_MD5SUM is not set +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +# CONFIG_MV is not set +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PRINTENV is not set +# CONFIG_PRINTF is not set +# CONFIG_PWD is not set +# CONFIG_REALPATH is not set +CONFIG_RM=y +# CONFIG_RMDIR is not set +# CONFIG_SEQ is not set +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +# CONFIG_SORT is not set +# CONFIG_FEATURE_SORT_BIG is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +# CONFIG_STTY is not set +# CONFIG_SUM is not set +# CONFIG_SYNC is not set +# CONFIG_TAIL is not set +# CONFIG_FEATURE_FANCY_TAIL is not set +# CONFIG_TEE is not set +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +# CONFIG_TTY is not set +# CONFIG_UNAME is not set +# CONFIG_UNIQ is not set +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +# CONFIG_WATCH is not set +# CONFIG_WC is not set +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +# CONFIG_YES is not set + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +# CONFIG_FEATURE_HUMAN_READABLE is not set +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_CLEAR is not set +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +# CONFIG_RESET is not set +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +# CONFIG_MKTEMP is not set +# CONFIG_PIPE_PROGRESS is not set +# CONFIG_READLINK is not set +# CONFIG_FEATURE_READLINK_FOLLOW is not set +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_WHICH is not set + +# +# Editors +# +# CONFIG_AWK is not set +# CONFIG_FEATURE_AWK_MATH is not set +# CONFIG_ED is not set +# CONFIG_PATCH is not set +# CONFIG_SED is not set +# CONFIG_VI is not set +# CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_YANKMARK is not set +# CONFIG_FEATURE_VI_SEARCH is not set +# CONFIG_FEATURE_VI_USE_SIGNALS is not set +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +# CONFIG_FEATURE_VI_WIN_RESIZE is not set +# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set + +# +# Finding Utilities +# +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +CONFIG_FEATURE_GREP_CONTEXT=y +# CONFIG_XARGS is not set +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_2_4_MODULES=y +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +# CONFIG_DMESG is not set +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_GETOPT is not set +# CONFIG_HEXDUMP is not set +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_V0 is not set +# CONFIG_MORE is not set +# CONFIG_FEATURE_USE_TERMIOS is not set +CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +# CONFIG_LESS is not set +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +# CONFIG_STRINGS is not set +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +# CONFIG_TIME is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +# CONFIG_HOSTNAME is not set +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_IFCONFIG is not set +# CONFIG_FEATURE_IFCONFIG_STATUS is not set +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +# CONFIG_IFUPDOWN is not set +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +# CONFIG_NC is not set +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +# CONFIG_NETSTAT is not set +# CONFIG_NSLOOKUP is not set +# CONFIG_PING is not set +# CONFIG_FEATURE_FANCY_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set +# CONFIG_ROUTE is not set +# CONFIG_TELNET is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +# CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +# CONFIG_TRACEROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +# CONFIG_APP_UDHCPD is not set +# CONFIG_APP_UDHCPC is not set +# CONFIG_APP_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCP_SYSLOG is not set +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +# CONFIG_WGET is not set +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +# CONFIG_FREE is not set +# CONFIG_FUSER is not set +CONFIG_KILL=y +# CONFIG_KILLALL is not set +# CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_RENICE is not set +# CONFIG_BB_SYSCTL is not set +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_UPTIME is not set + +# +# Shells +# +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +CONFIG_ASH=y + +# +# Ash Shell Options +# +# CONFIG_ASH_JOB_CONTROL is not set +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +# CONFIG_ASH_ALIAS is not set +# CONFIG_ASH_MATH_SUPPORT is not set +# CONFIG_ASH_MATH_SUPPORT_64 is not set +# CONFIG_ASH_GETOPTS is not set +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +# CONFIG_FEATURE_COMMAND_EDITING is not set +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=0 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_SH_FANCY_PROMPT is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_KLOGD is not set +# CONFIG_LOGGER is not set Added: linux4palm/initramfs/device-nodes.tar.gz =================================================================== (Binary files differ) Property changes on: linux4palm/initramfs/device-nodes.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-09 09:12:33
|
Revision: 538 Author: bobofdoom Date: 2006-08-09 02:12:25 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=538&view=rev Log Message: ----------- Removing SVN's stupid temp file. Removed Paths: ------------- linux4palm/initramfs/svn-commit.tmp Deleted: linux4palm/initramfs/svn-commit.tmp =================================================================== --- linux4palm/initramfs/svn-commit.tmp 2006-08-09 09:09:27 UTC (rev 537) +++ linux4palm/initramfs/svn-commit.tmp 2006-08-09 09:12:25 UTC (rev 538) @@ -1,4 +0,0 @@ -Initial import of Cris' initramfs scripts. ---This line, and those below, will be ignored-- - -A . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <bob...@us...> - 2006-08-09 09:09:42
|
Revision: 537 Author: bobofdoom Date: 2006-08-09 02:09:27 -0700 (Wed, 09 Aug 2006) ViewCVS: http://svn.sourceforge.net/hackndev/?rev=537&view=rev Log Message: ----------- Initial import of Cris' initramfs scripts. Added Paths: ----------- linux4palm/initramfs/ linux4palm/initramfs/Makefile linux4palm/initramfs/files/ linux4palm/initramfs/files/etc/ linux4palm/initramfs/files/etc/modules.initrd linux4palm/initramfs/files/init linux4palm/initramfs/svn-commit.tmp Added: linux4palm/initramfs/Makefile =================================================================== --- linux4palm/initramfs/Makefile (rev 0) +++ linux4palm/initramfs/Makefile 2006-08-09 09:09:27 UTC (rev 537) @@ -0,0 +1,3 @@ +# TODO; +# Build an initramfs image from busybox source. +# Using klibc if possible for nice smallness. Added: linux4palm/initramfs/files/etc/modules.initrd =================================================================== --- linux4palm/initramfs/files/etc/modules.initrd (rev 0) +++ linux4palm/initramfs/files/etc/modules.initrd 2006-08-09 09:09:27 UTC (rev 537) @@ -0,0 +1,3 @@ +fat.ko +vfat.ko +loop.ko Property changes on: linux4palm/initramfs/files/etc/modules.initrd ___________________________________________________________________ Name: svn:executable + Added: linux4palm/initramfs/files/init =================================================================== --- linux4palm/initramfs/files/init (rev 0) +++ linux4palm/initramfs/files/init 2006-08-09 09:09:27 UTC (rev 537) @@ -0,0 +1,132 @@ +#!/bin/sh +# $Id: $ +# authors: Cristiano P. +# + +# TODO: echo only if VERBOSE +# TODO: check the whole thing ... + +# defaults: +VERBOSE=true +FILES_DEV=/dev/mmcblk0p1 +FILES_MNT=/media/mmc1 +ROOT_DEV=$FILES_MNT/opie-image-v0.8.4-rc3-palmtx.rootfs.ext2 +#ROOT_DEV=/dev/mmcblk0p5 +#SWAP_DEV=$CARD_MNT/swap.fs +SWAP_DEV=/dev/mmcblk0p7 + +MODULES_DIR="/lib/modules" +POST_MODULES_SCRIPT="" + +echo initram init started + + +if [ -f /etc/modules.initrd ]; then + echo loading initial modules + cat /etc/modules.initrd | while read module; do + echo loading module: $module + /sbin/insmod $MODULES_DIR/$module > /dev/null + done +fi + +echo mounting sysfs +#mount -n -t sysfs none /sys +mount -n -t sysfs sys /sys >/dev/null 2>&1 || mount -t sysfs sys /sys + +echo mounting proc filesystem +#mount -n -t proc /proc +mount -n -t proc none /proc >/dev/null 2>&1 || mount -t proc none /proc + +if [ -b $FILES_DEV ]; then + echo -n "linux.boot.cfg on $FILES_DEV: " + /bin/mount -n -t vfat -o rw $FILES_DEV $FILES_MNT + /bin/sleep 1 + # todo: check parameters/files? + if [ -f $FILES_MNT/linux.boot.cfg ]; then + echo found. + . $FILES_MNT/linux.boot.cfg + + if [ -f $FILES_MNT/modules.initrd ]; then + echo loading additional modules now: + cat $FILES_MNT/modules.initrd | while read module; do + loading module: $module + /sbin/insmod $MODULES_DIR/$module > /dev/null + done + fi + + else + echo not found. + fi +else + echo fat16 partition not found. +fi + + +# this script could be used to update the rootfs before booting familiar (new modules, scripts, config, ...) +echo -n "post_module script: " +if [ -n "$POST_MODULES_SCRIPT" ]; then + if [ -f "$POST_MODULES_SCRIPT" ]; then + echo found $POST_MODULES_SCRIPT . + $POST_MODULES_SCRIPT + fi +else + echo not found. +fi + +# probably swap should/can be enabled by familiar +# is it the right place to mount swap? +if [ -n "$SWAP_DEV" ]; then + echo -n "mount swap at $SWAP_DEV: " + + if [ -f $SWAP_DEV -o -b $SWAP_DEV ]; then + /sbin/swapon $SWAP_DEV > /dev/null 2>&1 + echo done. + else + echo not found. + fi +fi + + +echo attempting to mount rootfs [$ROOT_DEV] + +ROOT_MOUNTED=true +UMOUNT_MMC=true + +if [ -f $ROOT_DEV ]; then + #echo 0x702 > /proc/sys/kernel/real-root-dev + mount -n $ROOT_DEV /newroot -o rw loop 2>/dev/null + [ $? ] || ROOT_MOUNTED=false + UMOUNT_MMC=false +elif [ -b $ROOT_DEV ]; then + mount -n $ROOT_DEV /newroot -o rw 2>/dev/null + [ $? ] || ROOT_MOUNTED=false +else + ROOT_MOUNTED=false +fi + +# probably this is not anymore needed here ... umount and free memory +if [ $UMOUNT_MMC = "true" ]; then + umount $FILES_MNT +fi + +# TODO: should initial /dev (/oldroot/dev) be unmounted after init by GPE? +if [ $ROOT_MOUNTED = "true" ]; then + echo root fs mounted + + # force umount sys and proc (otherwise we'll find them mounted twice) + umount -l /sys + umount -l /proc + + # method 2: use switch_root (needs initramfs) + exec /sbin/switch_root -c /dev/console /newroot /sbin/init 5 + + echo "* * * chroot failed! * * *" +else + echo could not mount root fs: init failed! + echo please, reset, check your configuration and retry. + sleep 100000 +fi + +# TODO: run ezhikov's keyshell here? +exec /bin/sh + Property changes on: linux4palm/initramfs/files/init ___________________________________________________________________ Name: svn:executable + Added: linux4palm/initramfs/svn-commit.tmp =================================================================== --- linux4palm/initramfs/svn-commit.tmp (rev 0) +++ linux4palm/initramfs/svn-commit.tmp 2006-08-09 09:09:27 UTC (rev 537) @@ -0,0 +1,4 @@ +Initial import of Cris' initramfs scripts. +--This line, and those below, will be ignored-- + +A . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
