5 files changed, 39 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d8635e8ea7..2d86f1ea07 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -521,7 +521,7 @@ FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-ch
 FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
 FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp -P  --no-check-certificate ${DL_DIR} ${URI}"
+RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}"
 UPDATECOMMAND = "ERROR, this must be a BitBake bug"
 UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 937ee3c3c6..914232926b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12158,6 +12158,10 @@ sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef
 md5=866fd13611a8de946428db1df9be8468
 sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7
 
+[http://www.hyperrealm.com/libconfig/libconfig-1.3.1.tar.gz]
+md5=f02bfa27a21b3040089026975b9dc0b8
+sha256=5677f32eff184883d7ca402234f92142f35bea7d04d503becdd104ae8343cb1c
+
 [http://repository.maemo.org/pool/maemo4.0/free/source/libc/libconic/libconic_0.13-0.8.tar.gz]
 md5=b4078390c459ae4df3acdabca36f53da
 sha256=1ee5bf796367d27987098f73dad866359e188cafe32f1871c12b4469f262c846
@@ -19798,6 +19802,10 @@ sha256=de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8
 md5=4508546d1ed0257ef7c128b6121b7208
 sha256=47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89
 
+[http://download.savannah.nongnu.org/releases/qwo/qwo-0.4.tar.gz]
+md5=72811b7d7fecfbdca45d5a74394daa4f
+sha256=c3b9bffd3e27090d4c0623ef61f48257343d0f6ea1cf573f5296250ab7551e5d
+
 [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz]
 md5=142b10ab27e837c3c4603cf9a7e9343b
 sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 18c9db1f3f..dac142abcd 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -8,7 +8,8 @@ require conf/machine/include/zaurus-clamshell.inc
 IMAGE_FSTYPES += "jffs2"
 
 ROOT_FLASH_SIZE = "25"
-# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
+# yes, we are aware that the husky and boxer (c760,c860) have 53MB rootfs,
+# but we don't make a special image for it.
 
 XSERVER = "xserver-kdrive-imageon"
 
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
new file mode 100644
index 0000000000..be38858ae9
--- /dev/null
+++ b/conf/machine/include/kirkwood.inc
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@DESCRIPTION: Machine configuration for various different Marvell Kirkwood based devices
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES 		= "kernel26 usbhost ext2 vfat mmc"
+MACHINE_TASK_PROVIDER 		= "task-base"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
+
+IMAGE_FSTYPES += "tar.gz"
+SERIAL_CONSOLE = "ttyS0 115200"
+
+# Currently all the orion devices we support use uImage
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x00008000"
+UBOOT_LOADADDRESS = "0x00008000"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/sheevaplug.conf b/conf/machine/sheevaplug.conf
new file mode 100644
index 0000000000..ee9ba6cb88
--- /dev/null
+++ b/conf/machine/sheevaplug.conf
@@ -0,0 +1,6 @@
+#@NAME: ARM based Marvell Sheevaplug
+
+MACHINE_EXTRA_RDEPENDS          = "u-boot-utils"
+MACHINE_EXTRA_RRECOMMENDS       = "kernel-modules"
+
+require conf/machine/include/kirkwood.inc