merge of ddc841bc5413de481ba5f7392575bba7a9ef04a7

     and f19ce428c20ed51be635a051213519acfded5d4b

5 files changed, 29 insertions, 10 deletions

diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
new file mode 100644
index 0000000000..0950a5a008
--- /dev/null
+++ b/conf/machine/borzoi.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C3100
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device
+
+KERNEL_VERSION ?= "2.4"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RRECOMMENDS += ""
+
+# Useful things for the built-in Harddisk
+BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
+
+IMAGE_FSTYPES = "jffs2 tar"
+
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 0c25562644..f9ecedad46 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -7,14 +7,13 @@ IPKG_ARCHS = "all arm ipaqsa h3600"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
 EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
-BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa ipaq-boot-params"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS = "alsa-driver handhelds-sa ipaq-boot-params"
+BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
 
 H3600_MODULES = "\
 h3600-asic \
 h3600-micro \
 h3600-microkbd h3600-stowaway \
-h3600-uda1341 \
 hwtimer \
 l3-backpaq \
 nvrd \
@@ -26,7 +25,6 @@ sa1100-rtc \
 sa1100usb-core \
 sd-mod \
 serial-h3800 \
-uda1341 \
 usb-char \
 usb-eth"
 
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 1616299ae9..7f56b32282 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -129,6 +129,7 @@ USE_VT = "0"
 #-------------------------------------------------------------------------------
 CVSDATE_gnu-config ?= "20050713"
 CVSDATE_gnu-config-native ?= "20050713"
+CVSDATE_ipkg-utils ?= "20050713"
 CVSDATE_ipkg-utils-native ?= "20050713"
 CVSDATE_ipkg-link ?= "20050713"
 
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 9b0ef708fa..b3e0a50bc6 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-
                              kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
                              kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
 # Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
-                             kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm
+#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
 
 # USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
-                             kernel-module-g-serial kernel-module-g-ether"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+#                             kernel-module-g-serial kernel-module-g-ether"
 
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index 285ab851ab..f55f2d2554 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -14,8 +14,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
+GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
+GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
 
 include conf/machine/handheld-common.conf