[oe-commits] org.oe.dev merge of '29c0c6efff11ca4f1cf8681ef59b975dc70b0738'

koen commit openembedded-commits at lists.openembedded.org
Tue Aug 14 14:43:46 UTC 2007


merge of '29c0c6efff11ca4f1cf8681ef59b975dc70b0738'
     and '5da1612b322f56f442443b8546bbe8e7a75289f3'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 32d243e53a633a69a4061e712897dae706da9eee
ViewMTN: http://monotone.openembedded.org/revision.psp?id=32d243e53a633a69a4061e712897dae706da9eee
Files:
1
packages/linux/linux-nokia770-2.6.12.3-osso14
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770
packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig
packages/linux/linux-nokia770-2.6.16-osso26
packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch
packages/linux/linux-nokia770-2.6.16-osso26/nokia770
packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig
packages/linux/linux-nokia770_2.6.12.3-osso14.bb
packages/linux/linux-nokia770_2.6.16-osso26.bb
packages/linux/linux-nokia800-2.6.18-osso29
packages/linux/linux-nokia800-2.6.18-osso40
packages/linux/linux-nokia800_2.6.18-osso29.bb
packages/linux/linux-nokia800_2.6.18-osso40.bb
packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
conf/machine/nokia770.conf
packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig
packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig
packages/linux/linux-nokia800.inc
packages/maemo/nokia770-init_1.0.bb
packages/sylpheed/claws-mail.inc
conf/distro/angstrom-2008.1.conf
Diffs:

#
# mt diff -r29c0c6efff11ca4f1cf8681ef59b975dc70b0738 -r32d243e53a633a69a4061e712897dae706da9eee
#
# 
# 
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14"
# 
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770"
# 
# delete "packages/linux/linux-nokia770-2.6.12.3-osso14/nokia770/defconfig"
# 
# delete "packages/linux/linux-nokia770-2.6.16-osso26"
# 
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_tlv320aic23_compile.patch"
# 
# delete "packages/linux/linux-nokia770-2.6.16-osso26/fix_usb_hub_compile.patch"
# 
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770"
# 
# delete "packages/linux/linux-nokia770-2.6.16-osso26/nokia770/defconfig"
# 
# delete "packages/linux/linux-nokia770_2.6.12.3-osso14.bb"
# 
# delete "packages/linux/linux-nokia770_2.6.16-osso26.bb"
# 
# rename "packages/linux/linux-nokia800-2.6.18-osso29"
#     to "packages/linux/linux-nokia800-2.6.18-osso40"
# 
# rename "packages/linux/linux-nokia800_2.6.18-osso29.bb"
#     to "packages/linux/linux-nokia800_2.6.18-osso40.bb"
# 
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch"
#  content [c56995add77d0c6266cf96e014fae27ba0b1ec1d]
# 
# add_file "packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch"
#  content [79031ff75ee9237e749692c9311a4ae85ee90c33]
# 
# patch "conf/machine/nokia770.conf"
#  from [c749c8d6db7ffaf93285d6780002db17ad815af9]
#    to [69e4e555b27d6664f5cb50b730dcf4f7c8f571b8]
# 
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia770/defconfig"
#  from [83984950b5f16c72590ba4cdad931c9d3719053c]
#    to [0c90d49ce8bad4a01318e88d4300bb9783bb99b0]
# 
# patch "packages/linux/linux-nokia800-2.6.18-osso40/nokia800/defconfig"
#  from [fe49a173d4a67d90ef5e0b47a86cc7b5a4d72750]
#    to [e86e6559444ad8443469928527615201bdcf2853]
# 
# patch "packages/linux/linux-nokia800.inc"
#  from [9c6cddb232a5b4c68ca6421351f0715a67a4a91a]
#    to [c099bf50d2367d56a7a7f92d7972a909ef3f1c8b]
# 
# patch "packages/linux/linux-nokia800_2.6.18-osso40.bb"
#  from [a7a41c0847c0ff1e127f056153fd3807610a3003]
#    to [4f90826f9fe700b59636abc46e661fe893051730]
# 
# patch "packages/maemo/nokia770-init_1.0.bb"
#  from [e5a60e0b7b8720865500e60e11655879f7deab18]
#    to [e3c214434e1d0078821d1182c096dd223935d40c]
# 
# patch "packages/sylpheed/claws-mail.inc"
#  from [70dc56c3455d2a0844a513547e62dd0a066acb6f]
#    to [e5e9e5019fbe720b04bda75c8c0d5f602d636ffa]
# 
============================================================
--- packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch	c56995add77d0c6266cf96e014fae27ba0b1ec1d
+++ packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch	c56995add77d0c6266cf96e014fae27ba0b1ec1d
@@ -0,0 +1,30 @@
+---
+ arch/arm/oprofile/op_model_v6.c |    8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+Index: linux-g/arch/arm/oprofile/op_model_v6.c
+===================================================================
+--- linux-g.orig/arch/arm/oprofile/op_model_v6.c	2006-11-08 12:18:41.000000000 +0000
++++ linux-g/arch/arm/oprofile/op_model_v6.c	2007-05-23 14:11:19.000000000 +0100
+@@ -54,12 +54,6 @@
+ #define	EVT_DCACHE_MISS			0x0B
+ #define	EVT_DCACE_WRITE_BACK		0x0C
+ #define	EVT_PC_CHANGED			0x0D
+-#define	EVT_BCU_REQUEST			0x10
+-#define	EVT_BCU_FULL			0x11
+-#define	EVT_BCU_DRAIN			0x12
+-#define	EVT_BCU_ECC_NO_ELOG		0x14
+-#define	EVT_BCU_1_BIT_ERR		0x15
+-#define	EVT_RMW				0x16
+ /* EVT_CCNT is not hardware defined */
+ #define EVT_CCNT			0xFE
+ #define EVT_UNUSED			0xFF
+@@ -88,7 +82,7 @@ struct pmu_type {
+ static struct pmu_type pmu_parms[] = {
+ 	{
+ 		.id		= PMU_ARM11,
+-		.name		= "arm/arm11",
++		.name		= "arm/armv6",
+ 		.num_counters	= 3,
+ #ifdef CONFIG_ARCH_OMAP2
+ 		.interrupt	= 3,
============================================================
--- packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch	79031ff75ee9237e749692c9311a4ae85ee90c33
+++ packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch	79031ff75ee9237e749692c9311a4ae85ee90c33
@@ -0,0 +1,415 @@
+---
+ arch/arm/mach-omap1/board-nokia770.c |   60 +++++++++++++++++++++++++++++++----
+ arch/arm/mach-omap1/mmu.c            |    1 
+ drivers/cbus/tahvo-usb.c             |    4 +-
+ drivers/i2c/chips/isp1301_omap.c     |    1 
+ drivers/mtd/mtdchar.c                |    6 +++
+ drivers/mtd/mtdpart.c                |    5 ++
+ drivers/mtd/nand/omap-hw.c           |   55 +++++++++++++++-----------------
+ drivers/serial/8250.c                |    2 +
+ drivers/video/omap/omapfb_main.c     |    4 +-
+ include/asm-arm/arch-omap/keypad.h   |    3 +
+ include/asm-arm/arch-omap/serial.h   |   16 +++++++++
+ 11 files changed, 118 insertions(+), 39 deletions(-)
+
+Index: linux-g/arch/arm/mach-omap1/board-nokia770.c
+===================================================================
+--- linux-g.orig/arch/arm/mach-omap1/board-nokia770.c	2006-11-08 13:18:39.000000000 +0100
++++ linux-g/arch/arm/mach-omap1/board-nokia770.c	2007-08-13 16:23:15.000000000 +0200
+@@ -16,6 +16,8 @@
+ 
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
++#include <linux/workqueue.h>
++#include <linux/delay.h>
+ 
+ #include <asm/hardware.h>
+ #include <asm/mach-types.h>
+@@ -33,9 +35,12 @@
+ #include <asm/arch/gpio.h>
+ #include <asm/arch/omapfb.h>
+ #include <asm/arch/hwa742.h>
++#include <asm/arch/lcd_mipid.h>
+ 
+ #include "../plat-omap/dsp/dsp_common.h"
+ 
++#define ADS7846_PENDOWN_GPIO	15
++
+ static void __init omap_nokia770_init_irq(void)
+ {
+ 	/* On Nokia 770, the SleepX signal is masked with an
+@@ -75,9 +80,11 @@
+ };
+ 
+ static struct omap_kp_platform_data nokia770_kp_data = {
+-	.rows   = 8,
+-	.cols   = 8,
+-	.keymap = nokia770_keymap
++	.rows		= 8,
++	.cols		= 8,
++	.keymap		= nokia770_keymap,
++	.keymapsize	= ARRAY_SIZE(nokia770_keymap),
++	.delay		= 4,
+ };
+ 
+ static struct platform_device nokia770_kp_device = {
+@@ -94,6 +101,41 @@
+ 	&nokia770_kp_device,
+ };
+ 
++static void mipid_shutdown(struct mipid_platform_data *pdata)
++{
++	if (pdata->nreset_gpio != -1) {
++		printk(KERN_INFO "shutdown LCD\n");
++		omap_set_gpio_dataout(pdata->nreset_gpio, 0);
++		msleep(120);
++	}
++}
++
++static struct mipid_platform_data nokia770_mipid_platform_data = {
++	.shutdown = mipid_shutdown,
++};
++
++static void mipid_dev_init(void)
++{
++	const struct omap_lcd_config *conf;
++
++	conf = omap_get_config(OMAP_TAG_LCD, struct omap_lcd_config);
++	if (conf != NULL) {
++		nokia770_mipid_platform_data.nreset_gpio = conf->nreset_gpio;
++		nokia770_mipid_platform_data.data_lines = conf->data_lines;
++	}
++}
++
++static void ads7846_dev_init(void)
++{
++	if (omap_request_gpio(ADS7846_PENDOWN_GPIO) < 0)
++		printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
++}
++
++static int ads7846_get_pendown_state(void)
++{
++	return !omap_get_gpio_datain(ADS7846_PENDOWN_GPIO);
++}
++
+ static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = {
+ 	.x_max		= 0x0fff,
+ 	.y_max		= 0x0fff,
+@@ -101,14 +143,17 @@
+ 	.pressure_max	= 255,
+ 	.debounce_max	= 10,
+ 	.debounce_tol	= 3,
++	.debounce_rep	= 1,
++	.get_pendown_state	= ads7846_get_pendown_state,
+ };
+ 
+ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
+ 	[0] = {
+-		.modalias       = "lcd_lph8923",
++		.modalias       = "lcd_mipid",
+ 		.bus_num        = 2,
+ 		.chip_select    = 3,
+ 		.max_speed_hz   = 12000000,
++		.platform_data	= &nokia770_mipid_platform_data,
+ 	},
+ 	[1] = {
+ 		.modalias       = "ads7846",
+@@ -189,7 +234,7 @@
+ 	},
+ };
+ 
+-static struct omap_board_config_kernel nokia770_config[] = {
++static struct omap_board_config_kernel nokia770_config[] __initdata = {
+ 	{ OMAP_TAG_USB,		NULL },
+ 	{ OMAP_TAG_MMC,		&nokia770_mmc_config },
+ };
+@@ -235,7 +280,7 @@
+ 		printk("HP connected\n");
+ }
+ 
+-static void codec_delayed_power_down(void *arg)
++static void codec_delayed_power_down(struct work_struct *work)
+ {
+ 	down(&audio_pwr_sem);
+ 	if (audio_pwr_state == -1)
+@@ -326,9 +371,12 @@
+ 				ARRAY_SIZE(nokia770_spi_board_info));
+ 	omap_board_config = nokia770_config;
+ 	omap_board_config_size = ARRAY_SIZE(nokia770_config);
++	omap_gpio_init();
+ 	omap_serial_init();
+ 	omap_dsp_init();
+ 	hwa742_dev_init();
++	ads7846_dev_init();
++	mipid_dev_init();
+ }
+ 
+ static void __init omap_nokia770_map_io(void)
+Index: linux-g/arch/arm/mach-omap1/mmu.c
+===================================================================
+--- linux-g.orig/arch/arm/mach-omap1/mmu.c	2007-08-13 13:54:01.000000000 +0200
++++ linux-g/arch/arm/mach-omap1/mmu.c	2007-08-13 16:23:15.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
+ #include <linux/err.h>
++#include <linux/delay.h>
+ #include "mmu.h"
+ #include <asm/tlbflush.h>
+ 
+Index: linux-g/drivers/cbus/tahvo-usb.c
+===================================================================
+--- linux-g.orig/drivers/cbus/tahvo-usb.c	2006-11-08 13:18:51.000000000 +0100
++++ linux-g/drivers/cbus/tahvo-usb.c	2007-08-13 16:23:15.000000000 +0200
+@@ -135,8 +135,8 @@
+ 		if ((!(OTG_CTRL_REG & OTG_DRIVER_SEL)) &&
+ 		   tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
+ 			/* role is host */
+-			usb_bus_start_enum(tu->otg.host,
+-					   tu->otg.host->otg_port);
++			//usb_bus_start_enum(tu->otg.host,
++			//		   tu->otg.host->otg_port);
+ 		}
+ 		OTG_IRQ_SRC_REG = DRIVER_SWITCH;
+ 	} else
+Index: linux-g/drivers/i2c/chips/isp1301_omap.c
+===================================================================
+--- linux-g.orig/drivers/i2c/chips/isp1301_omap.c	2006-11-08 13:18:51.000000000 +0100
++++ linux-g/drivers/i2c/chips/isp1301_omap.c	2007-08-13 16:23:15.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <linux/usb_gadget.h>
+ #include <linux/usb.h>
+ #include <linux/usb_otg.h>
++#include <linux/usb/otg.h>
+ #include <linux/i2c.h>
+ #include <linux/workqueue.h>
+ 
+Index: linux-g/drivers/mtd/mtdchar.c
+===================================================================
+--- linux-g.orig/drivers/mtd/mtdchar.c	2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/mtdchar.c	2007-08-13 16:23:15.000000000 +0200
+@@ -622,6 +622,12 @@
+ 		break;
+ 	}
+ 
++        case MEMSETOOBSEL:
++        {
++                break;
++        }
++
++
+ 	case MEMGETBADBLOCK:
+ 	{
+ 		loff_t offs;
+Index: linux-g/drivers/mtd/mtdpart.c
+===================================================================
+--- linux-g.orig/drivers/mtd/mtdpart.c	2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/mtdpart.c	2007-08-13 16:23:15.000000000 +0200
+@@ -200,6 +200,11 @@
+ 		return -EINVAL;
+ 	instr->addr += part->offset;
+ 	ret = part->master->erase(part->master, instr);
++	if (ret) {
++		if (instr->fail_addr != 0xffffffff)
++			instr->fail_addr -= part->offset;
++		instr->addr -= part->offset;
++	}
+ 	return ret;
+ }
+ 
+Index: linux-g/drivers/mtd/nand/omap-hw.c
+===================================================================
+--- linux-g.orig/drivers/mtd/nand/omap-hw.c	2006-11-08 13:18:55.000000000 +0100
++++ linux-g/drivers/mtd/nand/omap-hw.c	2007-08-13 16:23:15.000000000 +0200
+@@ -386,11 +386,6 @@
+ 	return nand_read_reg8(NND_ACCESS);
+ }
+ 
+-static void omap_nand_write_byte(struct mtd_info *mtd, u_char byte)
+-{
+-	nand_write_reg8(NND_ACCESS, byte);
+-}
+-
+ static int omap_nand_dev_ready(struct mtd_info *mtd)
+ {
+ 	u32 l;
+@@ -425,9 +420,9 @@
+ 	if (command == NAND_CMD_SEQIN) {
+ 		int readcmd;
+ 
+-		if (column >= mtd->oobblock) {
++		if (column >= mtd->writesize) {
+ 			/* OOB area */
+-			column -= mtd->oobblock;
++			column -= mtd->writesize;
+ 			readcmd = NAND_CMD_READOOB;
+ 		} else if (column < 256) {
+ 			/* First 256 bytes --> READ0 */
+@@ -458,7 +453,7 @@
+ 	struct nand_chip *this = mtd->priv;
+ 
+ 	if (command == NAND_CMD_READOOB) {
+-		column += mtd->oobblock;
++		column += mtd->writesize;
+ 		command = NAND_CMD_READ0;
+ 	}
+ 	switch (command) {
+@@ -495,7 +490,8 @@
+ 	int n;
+ 	struct nand_chip *this = mtd->priv;
+ 
+-	if (this->eccmode == NAND_ECC_HW12_2048)
++	/* Ex NAND_ECC_HW12_2048 */
++	if ((this->ecc.mode == NAND_ECC_HW) && (this->ecc.size  == 2048))
+ 		n = 4;
+ 	else
+ 		n = 1;
+@@ -642,7 +638,8 @@
+ 	int block_count = 0, i, r;
+ 
+ 	this = mtd->priv;
+-	if (this->eccmode == NAND_ECC_HW12_2048)
++	/* Ex NAND_ECC_HW12_2048 */
++	if ((this->ecc.mode == NAND_ECC_HW) && (this->ecc.size  == 2048))
+ 		block_count = 4;
+ 	else
+ 		block_count = 1;
+@@ -672,12 +669,12 @@
+ {
+ 	static const char *part_parsers[] = { "cmdlinepart", NULL };
+ 	struct mtd_partition *parts;
+-	const struct omap_flash_part_config *cfg;
++	const struct omap_flash_part_str_config *cfg;
+ 	char *part_str = NULL;
+ 	size_t part_str_len;
+ 	int c;
+ 
+-	cfg = omap_get_var_config(OMAP_TAG_FLASH_PART, &part_str_len);
++	cfg = omap_get_var_config(OMAP_TAG_FLASH_PART_STR, &part_str_len);
+ 	if (cfg != NULL) {
+ 		part_str = kmalloc(part_str_len + 1, GFP_KERNEL);
+ 		if (part_str == NULL)
+@@ -794,19 +791,20 @@
+ 
+ 	/* Used from chip select and nand_command() */
+ 	this->read_byte = omap_nand_read_byte;
+-	this->write_byte = omap_nand_write_byte;
+ 
+-	this->select_chip = omap_nand_select_chip;
+-	this->dev_ready = omap_nand_dev_ready;
+-	this->chip_delay = 0;
+-	this->eccmode = NAND_ECC_HW3_512; 
+-	this->cmdfunc = omap_nand_command;
+-	this->write_buf = omap_nand_write_buf;
+-	this->read_buf = omap_nand_read_buf;
+-	this->verify_buf = omap_nand_verify_buf;
+-	this->calculate_ecc = omap_nand_calculate_ecc;
+-	this->correct_data = omap_nand_correct_data;
+-	this->enable_hwecc = omap_nand_enable_hwecc;
++	this->select_chip   = omap_nand_select_chip;
++	this->dev_ready     = omap_nand_dev_ready;
++	this->chip_delay    = 0;
++	this->ecc.mode      = NAND_ECC_HW;
++	this->ecc.bytes     = 3;
++	this->ecc.size      = 512;
++	this->cmdfunc       = omap_nand_command;
++	this->write_buf     = omap_nand_write_buf;
++	this->read_buf      = omap_nand_read_buf;
++	this->verify_buf    = omap_nand_verify_buf;
++	this->ecc.calculate = omap_nand_calculate_ecc;
++	this->ecc.correct   = omap_nand_correct_data;
++	this->ecc.hwctl     = omap_nand_enable_hwecc;
+ 
+ 	nand_write_reg(NND_SYSCFG, 0x1); /* Enable auto idle */
+ 	nand_write_reg(NND_PSC_CLK, 10);
+@@ -822,11 +820,10 @@
+ 		l = nand_read_reg(NND_CTRL);
+ 		l |= 1 << 4; /* Set the A8 bit in CTRL reg */
+ 		nand_write_reg(NND_CTRL, l);
+-		this->eccmode = NAND_ECC_HW12_2048;
+-		this->eccsteps = 1;
+-		this->eccsize = 2048;
+-		this->eccbytes = 12;
+-		omap_mtd->eccsize = 2048;
++		this->ecc.mode = NAND_ECC_HW;
++		this->ecc.steps = 1;
++		this->ecc.size = 2048;
++		this->ecc.bytes = 12;
+ 		nand_write_reg(NND_ECC_SELECT, 6);
+ 	}
+ 
+Index: linux-g/drivers/serial/8250.c
+===================================================================
+--- linux-g.orig/drivers/serial/8250.c	2006-11-08 13:18:59.000000000 +0100
++++ linux-g/drivers/serial/8250.c	2007-08-13 16:23:15.000000000 +0200
+@@ -44,6 +44,8 @@
+ #include <asm/io.h>
+ #include <asm/irq.h>
+ 
++#include <asm/arch/serial.h>
++
+ #include "8250.h"
+ 
+ /*
+Index: linux-g/drivers/video/omap/omapfb_main.c
+===================================================================
+--- linux-g.orig/drivers/video/omap/omapfb_main.c	2007-08-13 13:54:01.000000000 +0200
++++ linux-g/drivers/video/omap/omapfb_main.c	2007-08-13 16:23:15.000000000 +0200
+@@ -110,7 +110,7 @@
+ 
+ #ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
+ #ifdef CONFIG_ARCH_OMAP1
+-extern struct lcd_ctrl_extif omap1_ext_if;
++extern struct lcd_ctrl_extif sossi_extif;
+ #else
+ extern struct lcd_ctrl_extif omap2_ext_if;
+ #endif
+@@ -1658,7 +1658,7 @@
+ #ifdef CONFIG_ARCH_OMAP1
+ 	fbdev->int_ctrl = &omap1_int_ctrl;
+ #ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
+-	fbdev->ext_if = &omap1_ext_if;
++	fbdev->ext_if = &sossi_extif;
+ #endif
+ #else	/* OMAP2 */
+ 	fbdev->int_ctrl = &omap2_int_ctrl;
+Index: linux-g/include/asm-arm/arch-omap/keypad.h
+===================================================================
+--- linux-g.orig/include/asm-arm/arch-omap/keypad.h	2006-11-08 13:19:11.000000000 +0100
++++ linux-g/include/asm-arm/arch-omap/keypad.h	2007-08-13 16:23:15.000000000 +0200
+@@ -14,7 +14,10 @@
+ 	int rows;
+ 	int cols;
+ 	int *keymap;
++	unsigned int keymapsize;
+ 	unsigned int rep:1;
++	unsigned long delay;
++	unsigned int dbounce:1;
+ 	/* specific to OMAP242x*/
+ 	unsigned int *row_gpios;
+ 	unsigned int *col_gpios;
+Index: linux-g/include/asm-arm/arch-omap/serial.h
+===================================================================
+--- linux-g.orig/in%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r5da1612b322f56f442443b8546bbe8e7a75289f3 -r32d243e53a633a69a4061e712897dae706da9eee
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [db66ecf290b2cc5303e089d928c440e0e7fb7614]
#    to [783879e52665932b7ebc461dd753e4481635d326]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	db66ecf290b2cc5303e089d928c440e0e7fb7614
+++ conf/distro/angstrom-2008.1.conf	783879e52665932b7ebc461dd753e4481635d326
@@ -18,19 +18,19 @@ DISTRO_REVISION = "0"
 DISTRO_VERSION = "2008.1-test-${DATE}"
 DISTRO_REVISION = "0"
 
-PREFERRED_VERSION_gcc               ?= "4.2.1"
-PREFERRED_VERSION_gcc-cross         ?= "4.2.1"
+PREFERRED_VERSION_gcc               = "4.2.1"
+PREFERRED_VERSION_gcc-cross         = "4.2.1"
 
-PREFERRED_VERSION_binutils          ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross    ?= "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils          = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross    = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross-sdk = "2.17.50.0.12"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.22"
+PREFERRED_VERSION_linux-libc-headers = "2.6.22"
 
-#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc ?= "2.6"
-PREFERRED_VERSION_glibc-intermediate ?= "2.6"
-PREFERRED_VERSION_glibc-initial ?= "2.6"
+#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
+PREFERRED_VERSION_glibc = "2.6"
+PREFERRED_VERSION_glibc-intermediate = "2.6"
+PREFERRED_VERSION_glibc-initial = "2.6"
 
 






More information about the Openembedded-commits mailing list