[oe-commits] org.oe.dev merge of '2d48e0fc062c46f883515824089be8f20112f660'

hrw commit openembedded-commits at lists.openembedded.org
Tue Jul 3 17:06:13 UTC 2007


merge of '2d48e0fc062c46f883515824089be8f20112f660'
     and 'a02852cd756c8f5d8eaccb9e4d36be9b524b0bfd'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 21801f89a96360de508f175ff49286262b9377c4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=21801f89a96360de508f175ff49286262b9377c4
Files:
1
packages/linux/linux/sarge-at91
conf/machine/sarge-at91.conf
packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch
packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch
packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch
packages/linux/linux/sarge-at91/defconfig
packages/uboot/u-boot-1.1.6/sarge-uboot.patch
packages/linux/linux.inc
packages/linux/linux_2.6.21.bb
packages/uboot/u-boot_1.1.6.bb
conf/machine/htcwallaby.conf
packages/linux/linux-hackndev-2.6/palmld/defconfig
Diffs:

#
# mt diff -r2d48e0fc062c46f883515824089be8f20112f660 -r21801f89a96360de508f175ff49286262b9377c4
#
# 
# 
# add_dir "packages/linux/linux/sarge-at91"
# 
# add_file "conf/machine/sarge-at91.conf"
#  content [c143fccacff25ccef3d78df850733d0a04c84286]
# 
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch"
#  content [214f7346ed9238c8e7169504a486dd0d9b8e8f6d]
# 
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch"
#  content [bf050035be44127be85f7e032a598eedf4633167]
# 
# add_file "packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch"
#  content [9260941cf7e54b07a87e8ffda492d2ff9a25a460]
# 
# add_file "packages/linux/linux/sarge-at91/defconfig"
#  content [887a1501d7a72435df8b09c025425ef867d22132]
# 
# add_file "packages/uboot/u-boot-1.1.6/sarge-uboot.patch"
#  content [c9ee9edf5969ee2d501b6edeae91189ad44478ab]
# 
# patch "packages/linux/linux.inc"
#  from [571ad2731ad0b3d6172a72c2f807cbcc9bb6c840]
#    to [8f12fd2369efd20b4d92e7d66a7ee05da953bd98]
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [53a97580492f0de948ef1e7ef160f429dc8a1408]
#    to [b173c031d2b38c69861aac233b95eb1254d0c9ed]
# 
# patch "packages/uboot/u-boot_1.1.6.bb"
#  from [4fc0f6a543827c9634e59fdcf640234b80d8580f]
#    to [2c312681345e37f99ff59ba0f3b883c44dd4f35c]
# 
============================================================
--- conf/machine/sarge-at91.conf	c143fccacff25ccef3d78df850733d0a04c84286
+++ conf/machine/sarge-at91.conf	c143fccacff25ccef3d78df850733d0a04c84286
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Sarge AT91RM9200 blackmesaeast dev boards
+#@DESCRIPTION: Machine configuration for sarge_at91 dev boards
+#
+#Homepage: http://blackmesaeast.com.pl/projects/electronics/sarge-single-board-computer/
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+IMAGE_FSTYPES = "tar.gz"
+
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm920t.conf
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+# device has own patchset for u-boot 1.1.6
+PREFERRED_VERSION_u-boot = "1.1.6"
+PREFERRED_VERSION_linux  = "2.6.21"
============================================================
--- packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch	214f7346ed9238c8e7169504a486dd0d9b8e8f6d
+++ packages/linux/linux/sarge-at91/2.6.21-sarge-kernel.patch	214f7346ed9238c8e7169504a486dd0d9b8e8f6d
@@ -0,0 +1,238 @@
+diff -Nurp ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S ./arch/arm/boot/compressed/head-at91rm9200.S
+--- ../linux-2.6.21.4/arch/arm/boot/compressed/head-at91rm9200.S	2007-06-12 22:29:12.000000000 +0200
++++ ./arch/arm/boot/compressed/head-at91rm9200.S	2007-06-12 02:57:07.000000000 +0200
+@@ -73,6 +73,12 @@
+ 		cmp	r7, r3
+ 		beq	99f
+ 
++                @ AT91RM9200
++                mov     r3,     #(MACH_TYPE_AT91RM9200 & 0xff)
++                orr     r3, r3, #(MACH_TYPE_AT91RM9200 & 0xff00)
++                cmp     r7, r3
++                beq     99f
++
+ 		@ Unknown board, use the AT91RM9200DK board
+ 		@ mov	r7, #MACH_TYPE_AT91RM9200
+ 		mov	r7,	#(MACH_TYPE_AT91RM9200DK & 0xff)
+diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c ./arch/arm/mach-at91/board-sarge.c
+--- ../linux-2.6.21.4/arch/arm/mach-at91/board-sarge.c	1970-01-01 01:00:00.000000000 +0100
++++ ./arch/arm/mach-at91/board-sarge.c	2007-06-12 02:57:07.000000000 +0200
+@@ -0,0 +1,190 @@
++/*
++ * linux/arch/arm/mach-at91/board-sarge.c
++ *
++ *  Copyright (C) 2007 BlackMesaEast staff
++ *
++ *	mcgregor at blackmesaeast.com.pl
++ *
++ * 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
++ */
++
++#include <linux/types.h>
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/mtd/physmap.h>
++
++#include <asm/hardware.h>
++#include <asm/setup.h>
++#include <asm/mach-types.h>
++#include <asm/irq.h>
++
++#include <asm/mach/arch.h>
++#include <asm/mach/map.h>
++#include <asm/mach/irq.h>
++
++#include <asm/arch/board.h>
++#include <asm/arch/gpio.h>
++#include <asm/arch/at91rm9200_mc.h>
++
++#include "generic.h"
++
++
++/*
++ * Serial port configuration.
++ *    0 .. 3 = USART0 .. USART3
++ *    4      = DBGU
++ */
++static struct at91_uart_config __initdata sarge_uart_config = {
++	.console_tty	= 0,				/* ttyS0 */
++	.nr_tty		= 5,
++	.tty_map	= { 4, 1, 0, 2, 3 }		/* ttyS0, ..., ttyS4 */
++};
++
++static void __init sarge_map_io(void)
++{
++	/* Initialize processor: 18.432 MHz crystal */
++	at91rm9200_initialize(18432000, AT91RM9200_PQFP);
++
++	/* Setup the serial ports and console */
++	at91_init_serial(&sarge_uart_config);
++}
++
++static void __init sarge_init_irq(void)
++{
++	at91rm9200_init_interrupts(NULL);
++}
++
++static struct at91_eth_data __initdata sarge_eth_data = {
++	.phy_irq_pin	= AT91_PIN_PB1,
++	.is_rmii	= 0,
++};
++
++static struct at91_usbh_data __initdata sarge_usbh_data = {
++	.ports		= 1,
++};
++
++static struct at91_udc_data __initdata sarge_udc_data = {
++	.vbus_pin	= AT91_PIN_PA20,
++	.pullup_pin	= AT91_PIN_PA21,
++};
++
++static struct at91_cf_data __initdata sarge_cf_data = {
++	.det_pin	= AT91_PIN_PB24,
++	.rst_pin	= AT91_PIN_PB23,
++	// .irq_pin	= ... not connected
++	// .vcc_pin	= ... always powered
++};
++
++static struct at91_mmc_data __initdata sarge_mmc_data = {
++	.det_pin	= AT91_PIN_PB0,
++	.slot_b		= 0,	
++	.wire4		= 1,	
++	.wp_pin		= AT91_PIN_PB2,
++};
++
++
++
++static struct spi_board_info sarge_spi_devices[] = {
++	{	/* DataFlash chip */
++		.modalias	= "mtd_dataflash",
++		.chip_select	= 0,
++		.max_speed_hz	= 15 * 1000 * 1000,
++	}
++};
++
++static struct mtd_partition __initdata sarge_nand_partition[] = {
++	{
++		.name	= "NAND Partition 1",
++		.offset	= 0,
++		.size	= MTDPART_SIZ_FULL,
++	},
++};
++
++static struct mtd_partition *nand_partitions(int size, int *num_partitions)
++{
++	*num_partitions = ARRAY_SIZE(sarge_nand_partition);
++	return sarge_nand_partition;
++}
++
++static struct at91_nand_data __initdata sarge_nand_data = {
++	.ale		= 22,
++	.cle		= 21,
++	.det_pin	= AT91_PIN_PB22,
++	.rdy_pin	= AT91_PIN_PB22,
++	// .enable_pin	= ... not there
++	.partition_info	= nand_partitions,
++};
++
++#define SARGE_FLASH_BASE	AT91_CHIPSELECT_0
++#define SARGE_FLASH_SIZE	0x200000
++
++static struct physmap_flash_data sarge_flash_data = {
++	.width		= 2,
++};
++
++static struct resource sarge_flash_resource = {
++	.start		= SARGE_FLASH_BASE,
++	.end		= SARGE_FLASH_BASE + SARGE_FLASH_SIZE - 1,
++	.flags		= IORESOURCE_MEM,
++};
++
++static struct platform_device sarge_flash = {
++	.name		= "physmap-flash",
++	.id		= 0,
++	.dev		= {
++				.platform_data	= &sarge_flash_data,
++			},
++	.resource	= &sarge_flash_resource,
++	.num_resources	= 1,
++};
++
++static void __init sarge_board_init(void)
++{
++	/* Serial */
++	at91_add_device_serial();
++	/* Ethernet */
++	at91_add_device_eth(&sarge_eth_data);
++	/* USB Host */
++	at91_add_device_usbh(&sarge_usbh_data);
++	/* USB Device */
++	at91_add_device_udc(&sarge_udc_data);
++	at91_set_multi_drive(sarge_udc_data.pullup_pin, 1);	/* pullup_pin is connected to reset */
++	/* Compact Flash */
++	at91_add_device_cf(&sarge_cf_data);
++	/* I2C */
++	at91_add_device_i2c();
++	/* SPI */
++	at91_add_device_spi(sarge_spi_devices, ARRAY_SIZE(sarge_spi_devices));
++
++	/* MMC */
++	at91_add_device_mmc(0, &sarge_mmc_data);
++	/* NAND */
++	at91_add_device_nand(&sarge_nand_data);
++	/* NOR Flash */
++	platform_device_register(&sarge_flash);
++}
++MACHINE_START(AT91RM9200, "Sarge AT91RM9200 SBC")
++	/* Maintainer: mcgregor at blackmesaeast.com.pl */
++	.phys_io	= AT91_BASE_SYS,
++	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
++	.boot_params	= AT91_SDRAM_BASE + 0x100,
++	.timer		= &at91rm9200_timer,
++	.map_io		= sarge_map_io,
++	.init_irq	= sarge_init_irq,
++	.init_machine	= sarge_board_init,
++MACHINE_END
+diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig ./arch/arm/mach-at91/Kconfig
+--- ../linux-2.6.21.4/arch/arm/mach-at91/Kconfig	2007-06-12 22:29:12.000000000 +0200
++++ ./arch/arm/mach-at91/Kconfig	2007-06-12 03:00:28.000000000 +0200
+@@ -90,6 +90,13 @@ config MACH_KAFA
+ 	help
+ 	  Select this if you are using Sperry-Sun's KAFA board.
+ 
++config MACH_SARGE
++        bool "Black Mesa East Sarge SBC"
++        depends on ARCH_AT91RM9200
++        help
++	  Select this if you are using BlackMesaEast Sarge PCB
++	  <http://blackmesaeast.com.pl>
++					    
+ config MACH_CHUB
+ 	bool "Promwad Chub board"
+ 	depends on ARCH_AT91RM9200
+diff -Nurp ../linux-2.6.21.4/arch/arm/mach-at91/Makefile ./arch/arm/mach-at91/Makefile
+--- ../linux-2.6.21.4/arch/arm/mach-at91/Makefile	2007-06-12 22:29:12.000000000 +0200
++++ ./arch/arm/mach-at91/Makefile	2007-06-12 03:00:47.000000000 +0200
+@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200)	+= board-kb920
+ obj-$(CONFIG_MACH_ATEB9200)	+= board-eb9200.o
+ obj-$(CONFIG_MACH_KAFA)		+= board-kafa.o
+ obj-$(CONFIG_MACH_CHUB)		+= board-chub.o
++obj-$(CONFIG_MACH_SARGE)	+= board-sarge.o
+ 
+ # AT91SAM9260 board-specific support
+ obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
============================================================
--- packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch	bf050035be44127be85f7e032a598eedf4633167
+++ packages/linux/linux/sarge-at91/2.6.21-sarge-mmc.patch	bf050035be44127be85f7e032a598eedf4633167
@@ -0,0 +1,87 @@
+diff -Nurp ../linux-2.6.21.4/drivers/mmc/at91_mci.c ./drivers/mmc/at91_mci.c
+--- ../linux-2.6.21.4/drivers/mmc/at91_mci.c	2007-06-12 22:29:12.000000000 +0200
++++ ./drivers/mmc/at91_mci.c	2007-06-12 03:52:55.000000000 +0200
+@@ -421,8 +421,11 @@ static unsigned int at91_mci_send_comman
+ 	if (cmd->opcode == MMC_STOP_TRANSMISSION)
+ 		cmdr |= AT91_MCI_TRCMD_STOP;
+ 
+-	if (host->bus_mode == MMC_BUSMODE_OPENDRAIN)
+-		cmdr |= AT91_MCI_OPDCMD;
++	//if (host->bus_mode == MMC_BUSMODE_OPENDRAIN)
++	//	cmdr |= AT91_MCI_OPDCMD;
++		
++	if (!(1/**machine_is_sarge*/) && host->bus_mode == MMC_BUSMODE_OPENDRAIN)
++	     cmdr |= AT91_MCI_OPDCMD;		
+ 
+ 	/*
+ 	 * Set the arguments and send the command
+@@ -739,7 +742,13 @@ static irqreturn_t at91_mci_irq(int irq,
+ 		at91_mci_write(host, AT91_MCI_IDR, 0xffffffff);
+ 		at91mci_completed_command(host);
+ 	} else
++//		at91_mci_write(host, AT91_MCI_IDR, int_status);
++	 {
++	    if (1 /*machine_is_sarge()*/)
++		at91_mci_write(host, AT91_MCI_IDR, (int_status & ~AT91_MCI_TXRDY) );
++	    else
+ 		at91_mci_write(host, AT91_MCI_IDR, int_status);
++	}		
+ 
+ 	return IRQ_HANDLED;
+ }
+diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc_block.c ./drivers/mmc/mmc_block.c
+--- ../linux-2.6.21.4/drivers/mmc/mmc_block.c	2007-06-07 23:27:31.000000000 +0200
++++ ./drivers/mmc/mmc_block.c	2007-06-12 04:19:36.000000000 +0200
+@@ -256,10 +256,24 @@ static int mmc_blk_issue_rq(struct mmc_q
+ 		 * this rule as they support querying the number of
+ 		 * successfully written sectors.
+ 		 */
+-		if (rq_data_dir(req) != READ &&
++//		if (rq_data_dir(req) != READ &&
++		    if ((1/**machine_is_sarge*/))
++		    {
++			if (rq_data_dir(req) != READ)
++			    brq.data.blocks = 1;
++		    }
++		    else if (rq_data_dir(req) != READ &&			
++
+ 		    !(card->host->caps & MMC_CAP_MULTIWRITE) &&
+ 		    !mmc_card_sd(card))
+ 			brq.data.blocks = 1;
++			
++			
++			
++			
++			
++			
++			
+ 
+ 		if (brq.data.blocks > 1) {
+ 			brq.data.flags |= MMC_DATA_MULTI;
+diff -Nurp ../linux-2.6.21.4/drivers/mmc/mmc.c ./drivers/mmc/mmc.c
+--- ../linux-2.6.21.4/drivers/mmc/mmc.c	2007-06-07 23:27:31.000000000 +0200
++++ ./drivers/mmc/mmc.c	2007-06-12 04:10:05.000000000 +0200
+@@ -1500,12 +1500,22 @@ static void mmc_setup(struct mmc_host *h
+ 	mmc_set_ios(host);
+ 
+ 	mmc_read_csds(host);
+-
++	/*
+ 	if (host->mode == MMC_MODE_SD) {
+ 		mmc_read_scrs(host);
+ 		mmc_read_switch_caps(host);
+ 	} else
+ 		mmc_process_ext_csds(host);
++	*/
++	
++	if (!(1/*machine_is_sarge*/))
++	{
++	    if (host->mode == MMC_MODE_SD) {
++		mmc_read_scrs(host);
++	    mmc_read_switch_caps(host);
++	    } else
++		mmc_process_ext_csds(host);
++	}	
+ }
+ 
+ 
============================================================
--- packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch	9260941cf7e54b07a87e8ffda492d2ff9a25a460
+++ packages/linux/linux/sarge-at91/2.6.21-sarge-phy.patch	9260941cf7e54b07a87e8ffda492d2ff9a25a460
@@ -0,0 +1,400 @@
+diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.c ./drivers/net/arm/at91_ether.c
+--- ../linux-2.6.21.4/drivers/net/arm/at91_ether.c	2007-06-12 22:29:12.000000000 +0200
++++ ./drivers/net/arm/at91_ether.c	2007-06-12 03:11:16.000000000 +0200
+@@ -235,6 +235,11 @@ static irqreturn_t at91ether_phy_interru
+ 		if (!(phy & (1 << 7)))
+ 			goto done;
+ 	}
++	else if (lp->phy_type == MII_STE100P_ID) {	
++		read_phy(lp->phy_address, MII_STE100P_XCSIIS_REG, &phy); /* ack interrupt in STE100P PHY */
++		if (!(phy & 0x007F))
++		    goto done;
++	}
+ 
+ 	update_linkspeed(dev, 0);
+ 
+@@ -303,6 +308,11 @@ static void enable_phyirq(struct net_dev
+ 		dsintr = dsintr | 0x3;			/* set bits 0,1 */
+ 		write_phy(lp->phy_address, MII_DPMICR_REG, dsintr);
+ 	}
++	else if (lp->phy_type == MII_STE100P_ID) {	/* for STE100P PHY */
++		read_phy(lp->phy_address, MII_STE100P_XIE_REG, &dsintr);
++
++		dsintr |= 0x007F;
++	}
+ 
+ 	disable_mdi();
+ 	spin_unlock_irq(&lp->lock);
+@@ -359,6 +369,11 @@ static void disable_phyirq(struct net_de
+ 		dsintr = dsintr & ~0x3c;			/* clear bits 2..5 */
+ 		write_phy(lp->phy_address, MII_DPMISR_REG, dsintr);
+ 	}
++	else if (lp->phy_type == MII_STE100P_ID) {	/* for STE100P PHY */
++		read_phy(lp->phy_address, MII_STE100P_XIE_REG, &dsintr);
++		dsintr &= 0xFF80;
++		write_phy(lp->phy_address, MII_STE100P_XIE_REG, dsintr);
++	}
+ 
+ 	disable_mdi();
+ 	spin_unlock_irq(&lp->lock);
+@@ -1117,6 +1132,8 @@ static int __init at91ether_setup(unsign
+ 		printk(KERN_INFO "%s: Teridian 78Q21x3 PHY\n", dev->name);
+ 	else if (phy_type == MII_LAN83C185_ID)
+ 		printk(KERN_INFO "%s: SMSC LAN83C185 PHY\n", dev->name);
++	else if (phy_type == MII_STE100P_ID)
++		printk(KERN_INFO "%s: STE100P PHY\n", dev->name);
+ 
+ 	return 0;
+ }
+@@ -1159,6 +1176,7 @@ static int __init at91ether_probe(struct
+ 			case MII_KS8721_ID:		/* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
+ 			case MII_T78Q21x3_ID:		/* Teridian 78Q21x3: PHY_ID1 = 0x0E, PHY_ID2 = 7237 */
+ 			case MII_LAN83C185_ID:		/* SMSC LAN83C185: PHY_ID1 = 0x0007, PHY_ID2 = 0xC0A1 */
++ 			case MII_STE100P_ID:		/* STE100P: PHY_ID1 = 0x1C04, PHY_ID2 = 0x0000 */
+ 				detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
+ 				break;
+ 		}
+diff -Nurp ../linux-2.6.21.4/drivers/net/arm/at91_ether.h ./drivers/net/arm/at91_ether.h
+--- ../linux-2.6.21.4/drivers/net/arm/at91_ether.h	2007-06-12 22:29:12.000000000 +0200
++++ ./drivers/net/arm/at91_ether.h	2007-06-12 03:07:54.000000000 +0200
+@@ -29,6 +29,15 @@
+ #define MII_ISINTS_REG		19
+ #define MII_LEDCTRL_REG		20
+ 
++/* STE100P specific registers */
++#define MII_STE100P_XCSIIS_REG  0x11
++#define MII_STE100P_XIE_REG     0x12
++#define MII_XCR_REG             0x00
++#define MII_XCR_ISOLATE      0x0400
++
++/* STE100P PHY */
++#define MII_STE100P_ID  0x1c040010
++
+ /* Realtek RTL8201 PHY */
+ #define MII_RTL8201_ID		0x00008200
+ 
+diff -Nurp ../linux-2.6.21.4/drivers/net/phy/Kconfig ./drivers/net/phy/Kconfig
+--- ../linux-2.6.21.4/drivers/net/phy/Kconfig	2007-06-07 23:27:31.000000000 +0200
++++ ./drivers/net/phy/Kconfig	2007-06-12 03:12:16.000000000 +0200
+@@ -62,6 +62,12 @@ config BROADCOM_PHY
+ 	---help---
+ 	  Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
+ 
++config STE100P_PHY
++        tristate "Drivers for the STE100P PHY"
++        depends on PHYLIB
++        ---help---
++          Currently supports the ste100p
++	  
+ config FIXED_PHY
+ 	tristate "Drivers fo%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -ra02852cd756c8f5d8eaccb9e4d36be9b524b0bfd -r21801f89a96360de508f175ff49286262b9377c4
#
# 
# 
# patch "conf/machine/htcwallaby.conf"
#  from [9eb8958a34abb017fe40020f1493f5bd050a6e52]
#    to [7eaaf072e197ae8aca3285e3c2c4decaa61230cc]
# 
# patch "packages/linux/linux-hackndev-2.6/palmld/defconfig"
#  from [18cced22397f2b63796bbcf120517ce9c26901ec]
#    to [d32cf1b06324559befddf07b45b8d50a55cc2ca0]
# 
============================================================
--- conf/machine/htcwallaby.conf	9eb8958a34abb017fe40020f1493f5bd050a6e52
+++ conf/machine/htcwallaby.conf	7eaaf072e197ae8aca3285e3c2c4decaa61230cc
@@ -10,7 +10,7 @@ require conf/machine/include/tune-strong
 
 require conf/machine/include/tune-strongarm.conf
 
-ROOT_FLASH_SIZE = "16" #?
+ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"
 GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone"
@@ -22,6 +22,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
+
+
 #
 # Modules autoload and other boot properties
 #
============================================================
--- packages/linux/linux-hackndev-2.6/palmld/defconfig	18cced22397f2b63796bbcf120517ce9c26901ec
+++ packages/linux/linux-hackndev-2.6/palmld/defconfig	d32cf1b06324559befddf07b45b8d50a55cc2ca0
@@ -1,11 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-hnd0
-# Tue Feb 27 17:46:56 2007
+# Linux kernel version: 2.6.21-hnd2
+# Tue Jul  3 14:32:58 2007
 #
 CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
 CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
@@ -15,6 +18,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -34,6 +38,7 @@ CONFIG_SYSVIPC=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
@@ -42,7 +47,7 @@ CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_IKCONFIG is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-# CONFIG_INITRAMFS_SOURCE is not set
+# CONFIG_BLK_DEV_INITRD is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
@@ -120,6 +125,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
@@ -128,6 +134,8 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
 
 #
 # Intel PXA2xx Implementations
@@ -156,6 +164,7 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_BLUEANGEL is not set
 # CONFIG_MACH_HTCBEETLES is not set
 # CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
 # CONFIG_ARCH_AXIMX3 is not set
 # CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_MACH_X50 is not set
@@ -165,22 +174,25 @@ CONFIG_PALMLD_IDE=m
 CONFIG_PALMLD_PCMCIA=m
 # CONFIG_PALMLD_USB is not set
 CONFIG_PALMLD_IDE=m
+CONFIG_PALMLD_BATTERY=m
+CONFIG_PALMLD_PM=y
 # CONFIG_MACH_XSCALE_PALMTREO650 is not set
 # CONFIG_MACH_XSCALE_TREO680 is not set
 # CONFIG_MACH_T700WX is not set
 # CONFIG_MACH_TUNGE2 is not set
 # CONFIG_MACH_T3XSCALE is not set
-CONFIG_GPIOED=m
-CONFIG_GPIOEDNG=m
 # CONFIG_MACH_XSCALE_PALMTT5 is not set
 # CONFIG_MACH_XSCALE_PALMTX is not set
 # CONFIG_MACH_PALMZ72 is not set
 # CONFIG_MACH_OMAP_PALMTC is not set
 # CONFIG_MACH_ZIRE31 is not set
+CONFIG_GPIOED=m
+CONFIG_GPIOEDNG=m
+# CONFIG_MACH_GHI270HG is not set
+# CONFIG_MACH_GHI270 is not set
 # CONFIG_PXA_SHARPSL is not set
 # CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_PXA27x=y
-CONFIG_PXA_RTC_EPOCH=1904
 
 #
 # Linux As Bootloader
@@ -204,20 +216,12 @@ CONFIG_ARM_THUMB=y
 #
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
 CONFIG_IWMMXT=y
 # CONFIG_ARMBOOT_PROC is not set
 CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
 
 #
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-
-#
 # Bus support
 #
 
@@ -251,6 +255,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -260,6 +265,8 @@ CONFIG_CMDLINE=""
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
 
 #
 # CPU Frequency scaling
@@ -287,8 +294,12 @@ CONFIG_BINFMT_ELF=y
 #
 # Power management options
 #
-# CONFIG_PM is not set
-# CONFIG_APM is not set
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_DPM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
 
 #
 # Networking
@@ -305,7 +316,9 @@ CONFIG_XFRM=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
 CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
@@ -376,8 +389,8 @@ CONFIG_IRDA=y
 #
 # IrDA protocols
 #
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
+CONFIG_IRLAN=y
+CONFIG_IRNET=y
 CONFIG_IRCOMM=y
 CONFIG_IRDA_ULTRA=y
 
@@ -386,7 +399,7 @@ CONFIG_IRDA_ULTRA=y
 #
 # CONFIG_IRDA_CACHE_LAST_LSAP is not set
 # CONFIG_IRDA_FAST_RR is not set
-CONFIG_IRDA_DEBUG=y
+# CONFIG_IRDA_DEBUG is not set
 
 #
 # Infrared-port device drivers
@@ -395,12 +408,11 @@ CONFIG_IRDA_DEBUG=y
 #
 # SIR device drivers
 #
-CONFIG_IRTTY_SIR=y
+# CONFIG_IRTTY_SIR is not set
 
 #
 # Dongle support
 #
-# CONFIG_DONGLE is not set
 
 #
 # Old SIR device drivers
@@ -414,16 +426,16 @@ CONFIG_IRTTY_SIR=y
 #
 # FIR device drivers
 #
-CONFIG_PXA_FICP=m
+CONFIG_PXA_FICP=y
 CONFIG_BT=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_HIDP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
 
 #
 # Bluetooth device drivers
@@ -433,17 +445,11 @@ CONFIG_BT_HCIUART_H4=y
 # CONFIG_BT_HCIUART_BCSP is not set
 # CONFIG_BT_HCIDTL1 is not set
 # CONFIG_BT_HCIBT3C is not set
+CONFIG_BT_BCM2035UART=m
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_IEEE80211 is not set
 
 #
 # Device Drivers
@@ -516,6 +522,7 @@ CONFIG_MTD_ABSENT=m
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_SHARP_SL is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -553,6 +560,7 @@ CONFIG_MTD_ABSENT=m
 #
 # Plug and Play support
 #
+# CONFIG_PNPACPI is not set
 
 #
 # Block devices
@@ -565,7 +573,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 
@@ -593,7 +600,6 @@ CONFIG_IDE_GENERIC=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -659,37 +665,13 @@ CONFIG_NETDEVICES=y
 #
 # Wireless LAN (non-hamradio)
 #
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
+# CONFIG_NET_RADIO is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_CF8305 is not set
+# CONFIG_LIBERTAS_CF8381 is not set
+# CONFIG_LIBERTAS_CF8385 is not set
 
 #
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_ACX is not set
-CONFIG_NET_WIRELESS=y
-
-#
 # PCMCIA network device support
 #
 # CONFIG_NET_PCMCIA is not set
@@ -698,17 +680,17 @@ CONFIG_NET_WIRELESS=y
 # Wan interfaces
 #
 # CONFIG_WAN is not set
-CONFIG_PPP=m
+CONFIG_PPP=y
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_SYNC_TTY=y
+CONFIG_PPP_DEFLATE=y
 # CONFIG_PPP_BSDCOMP is not set
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
-CONFIG_SLHC=m
+CONFIG_SLHC=y
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -738,6 +720,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_TSDEV_SCREEN_Y=480
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_LED_TRIGGER is not set
 
 #
 # Input Device Drivers
@@ -749,10 +732,10 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_GPIO_KEYS is not set
+# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_DIAGONAL is not set
 CONFIG_KEYBOARD_PXA27x=y
-CONFIG_KEYBOARD_PALMIR=y
-# CONFIG_KEYBOARD_PALMWK is not set
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -763,9 +746,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
 # CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_PALMTC is not set
 CONFIG_TOUCHSCREEN_WM97XX=m
 # CONFIG_TOUCHSCREEN_WM9705 is not set
 CONFIG_TOUCHSCREEN_WM9712=y
@@ -808,6 +790,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_PXA_IR is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_RS232_SERIAL is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -823,9 +806,9 @@ CONFIG_HW_RANDOM=m
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_NVRAM is not set
-CONFIG_SA1100_RTC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
+# CONFIG_TIHTC is not set
 
 #
 # PCMCIA character devices
@@ -861,46 +844,45 @@ CONFIG_SA1100_RTC=y
 #
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=y
+CONFIG_APM_POWER=y
+# CONFIG_BATTERY_DS2760 is not set
 
 #
-# Hardware Monitoring - Battery
+# L3 serial bus support
 #
-CONFIG_BATTERY_MONITOR=y
-# CONFIG_ADC_BATTERY is not set
+# CONFIG_L3 is not set
 
 #
-# L3 serial bus support
+# Misc devices
 #
-# CONFIG_L3 is not set
+# CONFIG_BATTCHARGE_MONITOR is not set
 
 #
-# SoC drivers
+# Multimedia Capabilities Port drivers
 #
+# CONFIG_ADC is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
 # CONFIG_SOC_MQ11XX is not set
 # CONFIG_SOC_T7L66XB is not set
 # CONFIG_SOC_TC6387XB is not set
 # CONFIG_SOC_TC6393XB is not set
-# CONFIG_SOC_SAMCOP is not set
-# CONFIG_SOC_HAMCOP is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_TSC2101 is not set
 # CONFIG_SOC_TSC2200 is not set
 
 #
-# Misc devices
-#
-CONFIG_BATTCHARGE_MONITOR=m
-
-#
-# Multimedia Capabilities Port drivers
-#
-# CONFIG_MCP is not set
-# CONFIG_ADC_ADS7846_SSP is not set
-# CONFIG_ADC_AD7877 is not set
-# CONFIG_TIFM_CORE is not set
-
-#
 # LED devices
 #
 CONFIG_NEW_LEDS=y
@@ -916,8 +898,9 @@ CONFIG_LEDS_TRIGGER_TIMER=m
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HWTIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
-# CONFIG_LEDS_TRIGGER_MMC_CARD is not set
+CONFIG_LEDS_TRIGGER_MMC_CARD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 # CONFIG_LEDS_TRIGGER_SHARED is not set
 
@@ -934,15 +917,26 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 #
 # Graphics support
 #
-CONFIG_FIRMWARE_EDID=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_PXAPWM=m
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
 # CONFIG_FB_IMAGEON is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
@@ -958,21 +952,22 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 
 #
 # Logo configuration
 #
 # CONFIG_LOGO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=m
 
 #
 # Sound
@@ -1036,6 +1031,7 @@ CONFIG_HID=y
 # HID Devices
 #
 CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
 
 #
 # USB support
@@ -1052,7 +1048,29 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 # USB Gadget Support
 #
-# CONFIG_USB_GADGET is not set
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+CONFIG_USB_GADGET_SX2=y
+CONFIG_USB_SX2=m
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_MQ11XX is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_CHAR is not set
 
 #
 # MMC/SD Card support
@@ -1061,7 +1079,6 @@ CONFIG_MMC_PXA=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_PXA=y
-# CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
 
@@ -1069,9 +1086,32 @@ CONFIG_RTC_LIB=y
 # Real Time Clock
 #
 CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_EPOCH=1904
+# CONFIG_RTC_DEBUG is not set
 
 #
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=y
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
 # File systems
 #
 CONFIG_EXT2_FS=y
@@ -1128,6 +1168,7 @@ CONFIG_RAMFS=y
 #
 # CONFIG_ADFS_FS is not s%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list