[oe-commits] org.oe.dev merge of 'a54a6607517e20ec074b70c4070cfa9d989624e1'

thesing commit oe at amethyst.openembedded.net
Mon Sep 1 18:09:27 UTC 2008


merge of 'a54a6607517e20ec074b70c4070cfa9d989624e1'
     and 'df64369ee8c68fc382142171ee6ae2a6494e7e74'

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 95770bf2dbbfdfc2877a9de6f9b4a50b875c6be2
ViewMTN: http://monotone.openembedded.org/revision/info/95770bf2dbbfdfc2877a9de6f9b4a50b875c6be2
Files:
1
packages/guile/files/configure-lossage.patch
packages/guile/files/gcc4.patch
packages/guile/guile_1.6.4.bb
packages/portaudio/portaudio-v19_20071207.bb
packages/gpsbabel/gpsbabel_1.3.3.bb
packages/gpsbabel/gpsbabel_1.3.5.bb
packages/portaudio/portaudio_0.0.19.bb
packages/portaudio/portaudio-v19_svn.bb
packages/rdesktop/rdesktop_1.5.0.bb
packages/rdesktop/rdesktop_1.6.0.bb
packages/phoneme
packages/phoneme/files
packages/povray/povray-3.6.1+3.7.0-beta25b
packages/xorg-lib/pixman
packages/atd/atd_0.80.bb
packages/gtk-webcore/midori_0.0.19.bb
packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch
packages/nandlogical/nandlogical-static_1.0.0.bb
packages/phoneme/files/phoneme-makefile-fix.patch
packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb
packages/phoneme/phoneme-advanced.inc
packages/povray/povray-3.6.1+3.7.0-beta25b/configure-cross-hack.patch
packages/povray/povray-3.6.1+3.7.0-beta25b/gcc43.diff
packages/povray/povray_3.6.1+3.7.0-beta25b.bb
packages/python/python-ptrace_0.3.2.bb
packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch
packages/xorg-lib/pixman/pixman-arm.patch
packages/xorg-lib/pixman_0.11.8.bb
MAINTAINERS
conf/checksums.ini
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
packages/busybox/busybox.inc
packages/busybox/busybox_1.9.2.bb
packages/classpath/classpath.inc
packages/dhcp/dhcp_3.0.1.bb
packages/dhcp/dhcp_3.0.2.bb
packages/linux/linux-omap2_git.bb
packages/linux/linux-rp-2.6.26/defconfig-akita
packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
packages/linux/linux-rp-2.6.26/defconfig-c7x0
packages/linux/linux-rp-2.6.26/defconfig-hx2000
packages/linux/linux-rp-2.6.26/defconfig-poodle
packages/linux/linux-rp-2.6.26/defconfig-qemuarm
packages/linux/linux-rp-2.6.26/defconfig-qemux86
packages/linux/linux-rp-2.6.26/defconfig-spitz
packages/linux/linux-rp-2.6.26/defconfig-zylonite
packages/lzma/lzma-native_4.17.bb
packages/nandlogical/nandlogical_1.0.0.bb
packages/openmoko2/openmoko-appmanager2_svn.bb
packages/tangogps/tangogps-fso_0.9.2.bb
packages/tasks/task-python-everything.bb
packages/u-boot/u-boot-git/akita
packages/u-boot/u-boot-git/c7x0
packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch
packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch
packages/u-boot/u-boot-git/pdaXrom-u-boot.patch
packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch
packages/u-boot/u-boot_git.bb
Diffs:

#
# mt diff -ra54a6607517e20ec074b70c4070cfa9d989624e1 -r95770bf2dbbfdfc2877a9de6f9b4a50b875c6be2
#
#
#
# delete "packages/guile/files/configure-lossage.patch"
# 
# delete "packages/guile/files/gcc4.patch"
# 
# delete "packages/guile/guile_1.6.4.bb"
# 
# delete "packages/portaudio/portaudio-v19_20071207.bb"
# 
# rename "packages/gpsbabel/gpsbabel_1.3.3.bb"
#     to "packages/gpsbabel/gpsbabel_1.3.5.bb"
# 
# rename "packages/portaudio/portaudio_0.0.19.bb"
#     to "packages/portaudio/portaudio-v19_svn.bb"
# 
# rename "packages/rdesktop/rdesktop_1.5.0.bb"
#     to "packages/rdesktop/rdesktop_1.6.0.bb"
# 
# add_dir "packages/phoneme"
# 
# add_dir "packages/phoneme/files"
# 
# add_dir "packages/povray/povray-3.6.1+3.7.0-beta25b"
# 
# add_dir "packages/xorg-lib/pixman"
# 
# add_file "packages/atd/atd_0.80.bb"
#  content [ce5c151d027312306ae72407176c902fd5e2df01]
# 
# add_file "packages/gtk-webcore/midori_0.0.19.bb"
#  content [ca09653d60b9011202d481bd484270b7c09b43d2]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch"
#  content [95eea5cc96584fc3e342db6e81d5ad7a88218a80]
# 
# add_file "packages/nandlogical/nandlogical-static_1.0.0.bb"
#  content [c6eb029366961e0afd263bbe27cd2e6cd0078dcf]
# 
# add_file "packages/phoneme/files/phoneme-makefile-fix.patch"
#  content [17a4c4f069d714e21e70a25fcbc9cd8d788082db]
# 
# add_file "packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb"
#  content [aa80f45ba22c3a76ef6825a5ac1e27ba443a968a]
# 
# add_file "packages/phoneme/phoneme-advanced.inc"
#  content [007bcceb2ee829e446bc8efb4e871e5750fabb1b]
# 
# add_file "packages/povray/povray-3.6.1+3.7.0-beta25b/configure-cross-hack.patch"
#  content [ce2aea2be24afb2392b15b35a386500a37377c27]
# 
# add_file "packages/povray/povray-3.6.1+3.7.0-beta25b/gcc43.diff"
#  content [98e051b7da9a68b92c0e6fa775216fc5a2b1b521]
# 
# add_file "packages/povray/povray_3.6.1+3.7.0-beta25b.bb"
#  content [57cd12ca21a71cfd395d056e0863bbcf94f8c61d]
# 
# add_file "packages/python/python-ptrace_0.3.2.bb"
#  content [0f90f9660627795440c3166b852a0eece9b71cfa]
# 
# add_file "packages/rdesktop/rdesktop_1.5.0.bb"
#  content [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
# 
# add_file "packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch"
#  content [1745cb136349f6b3095458128c6e4db6076b8864]
# 
# add_file "packages/xorg-lib/pixman/pixman-arm.patch"
#  content [7945648f6d678de76999d8c9914b8d2d36a236dd]
# 
# add_file "packages/xorg-lib/pixman_0.11.8.bb"
#  content [b3452a5bc331bb65d38d02983e574ad69bc5cbb7]
# 
# patch "MAINTAINERS"
#  from [86c3ad4586fdf8bb08b7b9755791703eda5da5bf]
#    to [28764cdcfdb341b03a06748138a4f33addd9a882]
# 
# patch "conf/checksums.ini"
#  from [220049577807c299e5636ee748e66a9f43cd5e48]
#    to [a666fe7c398e19b3ec806de77c7d74799ebe271a]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [74a079b52c130ac3982443c39fd2b2919bd0a62c]
#    to [cbbb69b48411373416615825a20788cb411d02dc]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [8263ed045331336ef156ad477a680016513099eb]
#    to [3695a9c6c8bc8f564bfab557a07a7e454aa63eb3]
# 
# patch "conf/machine/om-gta01.conf"
#  from [a9074ead3cca6d3eb6fdc837d712eecfb35d4e91]
#    to [11955cc67c94d27c50a49e55a06ef8c96af9ad6e]
# 
# patch "conf/machine/om-gta02.conf"
#  from [1320182b35aa623d42f9cb99022c0533b54d5996]
#    to [857a1ed4810a63a7d75a7c68d2523b971f9a6c8a]
# 
# patch "packages/busybox/busybox.inc"
#  from [99fe4e1235f3e8d6f57649a3b0c84a1fd120d775]
#    to [1bd8d9defd1e1be813cfb434b4b578697b1b33a7]
# 
# patch "packages/busybox/busybox_1.9.2.bb"
#  from [d57bfa894a3e0caf97bd34c841fbe24ab3b167fd]
#    to [e67cffcad4bfadee85161e3e26073ad85cd557d2]
# 
# patch "packages/classpath/classpath.inc"
#  from [38c3e19b11832c4ee048c930972f95afbc256c0c]
#    to [ec953cce26d7aeec31b06aa3dbce43c70686a735]
# 
# patch "packages/dhcp/dhcp_3.0.1.bb"
#  from [508e25e8ed777c42989948a97808577033112e60]
#    to [561093eb489c489029221984b0556f3de883d7c2]
# 
# patch "packages/dhcp/dhcp_3.0.2.bb"
#  from [22a60b2567e7a2cf31517547c1c7800734714419]
#    to [ec84b1ca88bad4389f98262e2bbcb8f313bd2556]
# 
# patch "packages/gpsbabel/gpsbabel_1.3.5.bb"
#  from [74c8983bc789932d363fc987244b08d4fab8b521]
#    to [3e5a504ca8d2083bad1497af1995f2f25510f74c]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [87915c4f021c2162daeb74e1fb307a622f4600c6]
#    to [fe0807df08f9b386baae24813ff6aa3f5636acc8]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-akita"
#  from [064c36530b213dae882be1b6bb2cbab8615906f8]
#    to [a0a3429c4b8ccf2f435e890ead2c2c201c5c904f]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-bootcdx86"
#  from [83dbfc0474bb18348ca67718d27d2dcc262095a3]
#    to [d1900766f3a9e8322678ced49e5a5bb93b2f332a]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-c7x0"
#  from [9840eec605b360f4cdcf976973331ce274a89b6f]
#    to [5c533bfba4b4fbfde44ddf442337a158ecc8a5fe]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-hx2000"
#  from [8d4023e3a924b2d01a60011c6aa81cca7bc83d06]
#    to [53a11bd3d87b58b40c49ee4586ab730d462b379c]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-poodle"
#  from [823d2a1579f2e5312396ba4c0d40a7405bcebd4f]
#    to [4c70a99ea564dc7a44015887b731791964dc9ee5]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemuarm"
#  from [19a7a240f8a4fd58732db1ccb11767dac8fc7221]
#    to [5b90b4f63559daa07eddb8a15d4226670dd5bf25]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemux86"
#  from [8f2d48208eb79e7a2e00941efcaee2cad2d34737]
#    to [d47c9d63424aa0cd8dcf1f956fd8af65f05f56b7]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-spitz"
#  from [121ce2ca2da79de4072c338f63ad9e345f2674bb]
#    to [3e79a57deaec2eed97be90695ff0b6abdcdc8a63]
# 
# patch "packages/linux/linux-rp-2.6.26/defconfig-zylonite"
#  from [71cf26b625ad773ac5468869fe7052854759f70f]
#    to [22182e2386826a6baf8d411b182d4bdaad6a91c0]
# 
# patch "packages/lzma/lzma-native_4.17.bb"
#  from [5311eac6c46a2960d3490db56ea225d1f8b06ade]
#    to [e156289d106897d745394d560b98ffb79ad68f0b]
# 
# patch "packages/nandlogical/nandlogical_1.0.0.bb"
#  from [08c2eb3a4bb34c4e5c03d312718add26413df421]
#    to [e8d8e415634193d69b9888bc2a858b0cda67e6d9]
# 
# patch "packages/openmoko2/openmoko-appmanager2_svn.bb"
#  from [f975706c2c4e83fb6d0e28b6b815b49ca25fe92d]
#    to [a2fa4a170f11eccc67016244c1685a69b88ef800]
# 
# patch "packages/portaudio/portaudio-v19_svn.bb"
#  from [6e0e4519a0c491b4df8965004e222f426ae15d72]
#    to [2412bb2e306a60afa27283238b90b401ca15749c]
# 
# patch "packages/rdesktop/rdesktop_1.6.0.bb"
#  from [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
#    to [dc304a9614cfa828cc7dd1d4a36c43a3e68434c1]
# 
# patch "packages/tangogps/tangogps-fso_0.9.2.bb"
#  from [5cbb978159e893365e050b41da156f5424b7d760]
#    to [625bd01843b531550ed8c10bb2dd04c1d9fab151]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [76ee4d36dc4c36625b1459bd63528acdd32188db]
#    to [51a6e92c2c5bb538d4094dea12781c8d68eb9746]
#
============================================================
--- packages/atd/atd_0.80.bb	ce5c151d027312306ae72407176c902fd5e2df01
+++ packages/atd/atd_0.80.bb	ce5c151d027312306ae72407176c902fd5e2df01
@@ -0,0 +1,14 @@
+DESCRIPTION = "Lightweight At Daemon"
+SECTION = "base"
+LICENSE = "GPLV2"
+RCONFLICTS = "at"
+RREPLACES = "at"
+
+PR = "r0"
+
+SRC_URI = "http://projects.linuxtogo.org/frs/download.php/222/${P}.tar.gz"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "atd"
+INITSCRIPT_PARAMS = "defaults 97"
============================================================
--- packages/gtk-webcore/midori_0.0.19.bb	ca09653d60b9011202d481bd484270b7c09b43d2
+++ packages/gtk-webcore/midori_0.0.19.bb	ca09653d60b9011202d481bd484270b7c09b43d2
@@ -0,0 +1,5 @@
+require midori.inc
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.bz2"
+
+
============================================================
--- packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch	95eea5cc96584fc3e342db6e81d5ad7a88218a80
+++ packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch	95eea5cc96584fc3e342db6e81d5ad7a88218a80
@@ -0,0 +1,275 @@
+From: Gadiyar, Anand <gadiyar at ti.com>
+Date: Wed, 13 Aug 2008 07:05:29 +0000 (+0530)
+Subject: MUSB: Workaround for simultaneous TX and RX usage
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2e6aa4efb0e14c51ff0427927b1b38136911fa93
+
+MUSB: Workaround for simultaneous TX and RX usage
+
+MUSB: Workaround for simultaneous TX and RX usage
+
+MUSB RTL V1.4 has a hardware issue which results in a DMA controller
+hang when TX and RX DMA channels are simultaneously enabled. This
+affects at least OMAP2430 and OMAP34XX.
+
+Since RX transfers are in Mode 0 and anyway result in one DMA interrupt
+per packet, we can use System DMA to unload the RX fifos. MUSB DMA can
+be used for all TX channels as before.
+
+Tested with full-duplex TX and RX transfers using g_ether. Runs for 24
+hours without a hang. Without this patch, the hang occurs within minutes.
+
+This issue was first reported by Jon Hunter on [1]
+
+[1] http://marc.info/?l=linux-omap&m=119634480534453&w=2
+
+Signed-off-by: Anand Gadiyar <gadiyar at ti.com>
+---
+
+diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
+index a485a86..8583e54 100644
+--- a/drivers/usb/musb/Kconfig
++++ b/drivers/usb/musb/Kconfig
+@@ -150,6 +150,14 @@ config USB_INVENTRA_DMA
+ 	help
+ 	  Enable DMA transfers using Mentor's engine.
+ 
++config MUSB_USE_SYSTEM_DMA_RX
++	bool 'Use System DMA for RX endpoints'
++	depends on USB_MUSB_HDRC && USB_INVENTRA_DMA
++	help
++	  MUSB RTL version 1.4 has a hardware issue when TX and RX DMA
++	  channels are simultaneously enabled. To work around this issue,
++	  you can choose to use System DMA for RX channels.
++
+ config USB_TI_CPPI_DMA
+ 	bool
+ 	depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
+diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
+index 32bb1e2..d1c1ea0 100644
+--- a/drivers/usb/musb/musbhsdma.c
++++ b/drivers/usb/musb/musbhsdma.c
+@@ -34,6 +34,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/platform_device.h>
+ #include "musb_core.h"
++#include <asm/arch/dma.h>
+ 
+ #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
+ #include "omap2430.h"
+@@ -64,6 +65,9 @@
+ 
+ #define MUSB_HSDMA_CHANNELS		8
+ 
++#define MUSB_FIFO_ADDRESS(epnum)	\
++	((unsigned long) (OMAP_HSOTG_BASE + MUSB_FIFO_OFFSET(epnum)))
++
+ struct musb_dma_controller;
+ 
+ struct musb_dma_channel {
+@@ -75,6 +79,8 @@ struct musb_dma_channel {
+ 	u8				bIndex;
+ 	u8				epnum;
+ 	u8				transmit;
++
++	int				sysdma_channel;
+ };
+ 
+ struct musb_dma_controller {
+@@ -93,6 +99,42 @@ static int dma_controller_start(struct dma_controller *c)
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_MUSB_USE_SYSTEM_DMA_RX
++static void musb_sysdma_completion(int lch, u16 ch_status, void *data)
++{
++	u32 dwAddress;
++	unsigned long flags;
++
++	struct dma_channel *pChannel;
++
++	struct musb_dma_channel *pImplChannel =
++					(struct musb_dma_channel *) data;
++	struct musb_dma_controller *controller = pImplChannel->controller;
++	struct musb *musb = controller->pDmaPrivate;
++	pChannel = &pImplChannel->Channel;
++
++	DBG(2, "lch = 0x%d, ch_status = 0x%x\n", lch, ch_status);
++	spin_lock_irqsave(&musb->lock, flags);
++
++	dwAddress = (u32) omap_get_dma_dst_pos(pImplChannel->sysdma_channel);
++	pChannel->actual_len = dwAddress - pImplChannel->dwStartAddress;
++
++	DBG(2, "ch %p, 0x%x -> 0x%x (%d / %d) %s\n",
++		pChannel, pImplChannel->dwStartAddress, dwAddress,
++		pChannel->actual_len, pImplChannel->len,
++		(pChannel->actual_len < pImplChannel->len) ?
++		"=> reconfig 0": "=> complete");
++
++	pChannel->status = MUSB_DMA_STATUS_FREE;
++	musb_dma_completion(musb, pImplChannel->epnum, pImplChannel->transmit);
++
++	spin_unlock_irqrestore(&musb->lock, flags);
++	return;
++}
++#else
++#define musb_sysdma_completion NULL
++#endif
++
+ static void dma_channel_release(struct dma_channel *pChannel);
+ 
+ static int dma_controller_stop(struct dma_controller *c)
+@@ -144,6 +186,29 @@ static struct dma_channel *dma_channel_allocate(struct dma_controller *c,
+ 			/* Tx => mode 1; Rx => mode 0 */
+ 			pChannel->desired_mode = transmit;
+ 			pChannel->actual_len = 0;
++			pImplChannel->sysdma_channel = -1;
++
++#ifdef CONFIG_MUSB_USE_SYSTEM_DMA_RX
++			if (!transmit) {
++				int ret;
++				ret = omap_request_dma(OMAP24XX_DMA_NO_DEVICE,
++					"MUSB SysDMA", musb_sysdma_completion,
++					(void *) pImplChannel,
++					&(pImplChannel->sysdma_channel));
++
++				if (ret) {
++					printk(KERN_ERR "request_dma failed:"
++							" %d\n", ret);
++					controller->bmUsedChannels &=
++								~(1 << bBit);
++					pChannel->status =
++							MUSB_DMA_STATUS_UNKNOWN;
++					pImplChannel->sysdma_channel = -1;
++					pChannel = NULL;
++				}
++			}
++#endif
++
+ 			break;
+ 		}
+ 	}
+@@ -163,6 +228,12 @@ static void dma_channel_release(struct dma_channel *pChannel)
+ 		~(1 << pImplChannel->bIndex);
+ 
+ 	pChannel->status = MUSB_DMA_STATUS_UNKNOWN;
++
++	if (pImplChannel->sysdma_channel != -1) {
++		omap_stop_dma(pImplChannel->sysdma_channel);
++		omap_free_dma(pImplChannel->sysdma_channel);
++		pImplChannel->sysdma_channel = -1;
++	}
+ }
+ 
+ static void configure_channel(struct dma_channel *pChannel,
+@@ -179,41 +250,69 @@ static void configure_channel(struct dma_channel *pChannel,
+ 	DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n",
+ 			pChannel, packet_sz, dma_addr, len, mode);
+ 
+-	if (mode) {
+-		csr |= 1 << MUSB_HSDMA_MODE1_SHIFT;
+-		BUG_ON(len < packet_sz);
++	if (pImplChannel->sysdma_channel != -1) {
++	/* System DMA */
++	/* RX: set src = FIFO */
++
++		omap_set_dma_transfer_params(pImplChannel->sysdma_channel,
++					OMAP_DMA_DATA_TYPE_S8,
++					len, 1, /* One frame */
++					OMAP_DMA_SYNC_ELEMENT,
++					OMAP24XX_DMA_NO_DEVICE,
++					0); /* Src Sync */
++
++		omap_set_dma_src_params(pImplChannel->sysdma_channel, 0,
++					OMAP_DMA_AMODE_CONSTANT,
++					MUSB_FIFO_ADDRESS(pImplChannel->epnum),
++					0, 0);
+ 
+-		if (packet_sz >= 64) {
+-			csr |= MUSB_HSDMA_BURSTMODE_INCR16
++		omap_set_dma_dest_params(pImplChannel->sysdma_channel, 0,
++					OMAP_DMA_AMODE_POST_INC, dma_addr,
++					0, 0);
++
++		omap_set_dma_dest_data_pack(pImplChannel->sysdma_channel, 1);
++		omap_set_dma_dest_burst_mode(pImplChannel->sysdma_channel,
++					OMAP_DMA_DATA_BURST_16);
++
++		omap_start_dma(pImplChannel->sysdma_channel);
++
++	} else { /* Mentor DMA */
++		if (mode) {
++			csr |= 1 << MUSB_HSDMA_MODE1_SHIFT;
++			BUG_ON(len < packet_sz);
++
++			if (packet_sz >= 64) {
++				csr |= MUSB_HSDMA_BURSTMODE_INCR16
+ 					<< MUSB_HSDMA_BURSTMODE_SHIFT;
+-		} else if (packet_sz >= 32) {
+-			csr |= MUSB_HSDMA_BURSTMODE_INCR8
++			} else if (packet_sz >= 32) {
++				csr |= MUSB_HSDMA_BURSTMODE_INCR8
+ 					<< MUSB_HSDMA_BURSTMODE_SHIFT;
+-		} else if (packet_sz >= 16) {
+-			csr |= MUSB_HSDMA_BURSTMODE_INCR4
++			} else if (packet_sz >= 16) {
++				csr |= MUSB_HSDMA_BURSTMODE_INCR4
+ 					<< MUSB_HSDMA_BURSTMODE_SHIFT;
++			}
+ 		}
+-	}
+ 
+-	csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT)
+-		| (1 << MUSB_HSDMA_ENABLE_SHIFT)
+-		| (1 << MUSB_HSDMA_IRQENABLE_SHIFT)
+-		| (pImplChannel->transmit
+-				? (1 << MUSB_HSDMA_TRANSMIT_SHIFT)
+-				: 0);
+-
+-	/* address/count */
+-	musb_writel(mbase,
+-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS),
+-		dma_addr);
+-	musb_writel(mbase,
+-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT),
+-		len);
+-
+-	/* control (this should start things) */
+-	musb_writew(mbase,
+-		MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL),
+-		csr);
++		csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT)
++			| (1 << MUSB_HSDMA_ENABLE_SHIFT)
++			| (1 << MUSB_HSDMA_IRQENABLE_SHIFT)
++			| (pImplChannel->transmit
++					? (1 << MUSB_HSDMA_TRANSMIT_SHIFT)
++					: 0);
++
++		/* address/count */
++		musb_writel(mbase,
++			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS),
++			dma_addr);
++		musb_writel(mbase,
++			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT),
++			len);
++
++		/* control (this should start things) */
++		musb_writew(mbase,
++			MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL),
++			csr);
++	} /* Mentor DMA */
+ }
+ 
+ static int dma_channel_program(struct dma_channel *pChannel,
+@@ -265,6 +364,12 @@ static int dma_channel_abort(struct dma_channel *pChannel)
+ 				MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR),
+ 				csr);
+ 		} else {
++			i%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rdf64369ee8c68fc382142171ee6ae2a6494e7e74 -r95770bf2dbbfdfc2877a9de6f9b4a50b875c6be2
#
#
#
# add_dir "packages/u-boot/u-boot-git/akita"
# 
# add_dir "packages/u-boot/u-boot-git/c7x0"
# 
# add_file "packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch"
#  content [f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f]
# 
# add_file "packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch"
#  content [fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2]
# 
# add_file "packages/u-boot/u-boot-git/pdaXrom-u-boot.patch"
#  content [4408ce632dc8396c6b94f28eef04221966d57e5f]
# 
# add_file "packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch"
#  content [fc8a7fd372731a45ff3a96eb8e871e75b8f11f48]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [dd5c9df20b550f8e184483944ba911d7de096d98]
#    to [d93f9d9cf79035943fc20dd1da8a9819c287ce12]
#
============================================================
--- packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch	f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f
+++ packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch	f9b0e2ea1193aa2d42961d5d2fe27de32a578a5f
@@ -0,0 +1,112 @@
+--- git/include/configs/akita.h	2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa1000000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " 	\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \
+ 	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -302,9 +302,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
+--- git/include/configs/akita.h	2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/akita.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa1000000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; "	 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; "	 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa1000000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " 	\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \
+ 	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -302,9 +302,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
============================================================
--- packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch	fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2
+++ packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch	fa75eafa60d12fff0eb8e9f9e840878fc43cfbb2
@@ -0,0 +1,112 @@
+--- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/corgi.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home); " 		\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " 				\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " 			\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa0800000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " 			\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home); " 	\
+	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -304,9 +304,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
+--- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000
++++ git/include/configs/corgi.h	2007-12-26 18:07:47.000000000 +0000
+@@ -81,35 +81,35 @@
+ 	"if testkey 101 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x00060000 0x00540000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " 		\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 2 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " 				\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " 			\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 18 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"if testkey 3 ; "												\
+ 	"then "														\
+ 		"nand read.logical 0xa0800000 0x005a0000 0x00160000; "							\
+-		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; "			 		\
++		"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; "			 	\
+ 		"bootm; "												\
+ 	"fi; "														\
+ 	"nand read.logical 0xa0800000 0x005a0000 0x00160000; "								\
+-	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " 			\
++	"setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " 	\
+	"bootm; "
+ #else
+ #define CONFIG_BOOTCOMMAND	"" // "run boot_flash"
+ #endif
+ 
+-#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192"
++#define CONFIG_BOOTARGS		"console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)"
+ #define CONFIG_SETUP_MEMORY_TAGS 1
+ #define CONFIG_CMDLINE_TAG	 1	/* enable passing of ATAGs	*/
+ #define CONFIG_INITRD_TAG	 1
+@@ -304,9 +304,9 @@
+ /* Note: fake mtd_id used, no linux mtd map file */
+ 
+ #define CONFIG_JFFS2_CMDLINE
+-#define MTDIDS_DEFAULT		"nand0=laze-0"
++#define MTDIDS_DEFAULT		"nand0=sharpsl-nand"
+ //#define MTDPARTS_DEFAULT	"mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)"
+-#define MTDPARTS_DEFAULT	"mtdparts=laze-0:7168k(Logical),-(JFFS2)"
++#define MTDPARTS_DEFAULT	"mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)"
+ 
+ /*
+  * SHARP SL NAND logical partition
============================================================
--- packages/u-boot/u-boot-git/pdaXrom-u-boot.patch	4408ce632dc8396c6b94f28eef04221966d57e5f
+++ packages/u-boot/u-boot-git/pdaXrom-u-boot.patch	4408ce632dc8396c6b94f28eef04221966d57e5f
@@ -0,0 +1,4934 @@
+diff -Nur u-boot-2006-04-18-1106/CREDITS u-boot-2006-04-18-1106-new/CREDITS
+--- u-boot-2006-04-18-1106/CREDITS	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/CREDITS	2006-07-05 11:19:44.000000000 +0000
+@@ -93,6 +93,12 @@
+ E: jonathan.debruyne at siemens.atea.be
+ D: Port to Siemens IAD210 board
+ 
++N: Alexander Chukov
++E: sash at pdaXrom.org
++D: initial support for Sharp Zaurus SL-C1000/3100
++D: initial support for Sharp Zaurus SL-C7x0/C860
++W: http://www.pdaXrom.org
++
+ N: Ken Chou
+ E: kchou at ieee.org
+ D: Support for A3000 SBC board
+diff -Nur u-boot-2006-04-18-1106/MAINTAINERS u-boot-2006-04-18-1106-new/MAINTAINERS
+--- u-boot-2006-04-18-1106/MAINTAINERS	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/MAINTAINERS	2006-07-05 11:19:44.000000000 +0000
+@@ -379,6 +379,11 @@
+ 
+ 	AT91RM9200DK		at91rm9200
+ 
++Alexander Chukov <sash at pdaXrom.org>
++
++	akita			xscale
++	corgi			xscale
++
+ George G. Davis <gdavis at mvista.com>
+ 
+ 	assabet			SA1100
+diff -Nur u-boot-2006-04-18-1106/MAKEALL u-boot-2006-04-18-1106-new/MAKEALL
+--- u-boot-2006-04-18-1106/MAKEALL	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/MAKEALL	2006-07-05 11:19:44.000000000 +0000
+@@ -206,7 +206,7 @@
+ 	adsvix		cerf250		cradle		csb226		\
+ 	delta		innokom		lubbock		pxa255_idp	\
+ 	wepep250	xaeniax		xm250		xsengine	\
+-	zylonite							\
++	zylonite	akita	corgi					\
+ "
+ 
+ LIST_ixp="ixdp425"
+diff -Nur u-boot-2006-04-18-1106/Makefile u-boot-2006-04-18-1106-new/Makefile
+--- u-boot-2006-04-18-1106/Makefile	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/Makefile	2006-07-05 11:19:44.000000000 +0000
+@@ -61,7 +61,7 @@
+ CROSS_COMPILE = powerpc-linux-
+ endif
+ ifeq ($(ARCH),arm)
+-CROSS_COMPILE = arm-linux-
++CROSS_COMPILE = armv5tel-linux-
+ endif
+ ifeq ($(ARCH),i386)
+ ifeq ($(HOSTARCH),i386)
+@@ -1709,6 +1709,12 @@
+ zylonite_config :
+ 	@./mkconfig $(@:_config=) arm pxa zylonite
+ 
++akita_config 	:	unconfig
++	@./mkconfig $(@:_config=) arm pxa akita
++
++corgi_config 	:	unconfig
++	@./mkconfig $(@:_config=) arm pxa corgi
++
+ #########################################################################
+ ## ARM1136 Systems
+ #########################################################################
+diff -Nur u-boot-2006-04-18-1106/README u-boot-2006-04-18-1106-new/README
+--- u-boot-2006-04-18-1106/README	2006-04-18 09:05:03.000000000 +0000
++++ u-boot-2006-04-18-1106-new/README	2006-07-05 11:19:44.000000000 +0000
+@@ -311,7 +311,8 @@
+ 		CONFIG_KB9202,		CONFIG_LART,		CONFIG_LPD7A400,
+ 		CONFIG_LUBBOCK,		CONFIG_OSK_OMAP5912,	CONFIG_OMAP2420H4,
+ 		CONFIG_SHANNON,		CONFIG_P2_OMAP730,	CONFIG_SMDK2400,
+-		CONFIG_SMDK2410,	CONFIG_TRAB,		CONFIG_VCMA9
++		CONFIG%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list