8 files changed, 3 insertions, 21 deletions
diff --git a/conf/documentation.conf b/conf/documentation.conf
index f10b05896d..f3c31ce609 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -23,7 +23,7 @@ HOST_CC_ARCH[doc] = "Normally same as the TARGET_CC_ARCH (@see TARGET_CC_ARCH)"
 
 TARGET_ARCH[doc] = "Build for which architecture. Examples are arm, i686, sh3, mips, powerpc"
 TARGET_OS[doc]   = "Build for which Operating System. Currently possible values are \
-linux and linux-ulibc"
+linux and linux-uclibc. When using linux-uclibc you might want to set USE_NLS_gcc-cross to \"no\"."
 TARGET_VENDOR[doc] = "FIXME"
 TARGET_SYS[doc] = "The target system is composed out of TARGET_ARCH,TARGET_VENDOR and TARGET_OS"
 TARGET_PREFIX[doc] = "The prefix for the cross compile toolchain. For example arm-linux-"
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 30bd894f26..784578074d 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules mipv6 atmelwlandriver"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
 BOOTSTRAP_EXTRA_RRECOMMENDS = "mipv6 hostap-modules-cs orinoco-modules-cs atmelwlandriver \
diff --git a/packages/mtd/mtd-utils-native_20050414.bb b/packages/hal/hal_0.2.98.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/mtd/mtd-utils-native_20050414.bb
+++ b/packages/hal/hal_0.2.98.bb
diff --git a/packages/hal/hal_0.2.bb b/packages/hal/hal_0.2.bb
deleted file mode 100644
index 400e7e054b..0000000000
--- a/packages/hal/hal_0.2.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "unknown"
-DESCRIPTION = "Hardware Abstraction Layer"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "dbus expat"
-RDEPENDS += "hotplug"
-HOMEPAGE = "http://freedesktop.org/Software/hal"
-LICENSE = "GPL LGPL AFL"
-
-SRC_URI = "http://freedesktop.org/~david/hal-${PV}/hal-${PV}.tar.gz"
-S = "${WORKDIR}/hal-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
-		--with-expat=${STAGING_LIBDIR}/.. \
-		--with-dbus-sys=${sysconfdir}/dbus-1/system.d \
-		--with-hotplug=${sysconfdir}/hotplug.d"
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb
index fd661b50d5..b038a75cc8 100644
--- a/packages/linux/handhelds-sa-2.6_cvs.bb
+++ b/packages/linux/handhelds-sa-2.6_cvs.bb
@@ -16,6 +16,7 @@ inherit kernel
 PAKCAGE_ARCH = "ipaqsa"
 PACKAGE_ARCH_jornada56x = "jornada56x"
 PACKAGE_ARCH_jornada720 = "jornada720"
+PACKAGE_ARCH_simpad     = "simpad"
 
 do_configure() {
 	install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config || die "No default configuration for ${MACHINE} available."
diff --git a/packages/mtd/mtd-utils_20050414.bb b/packages/mtd/mtd-utils-native_20050521.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/mtd/mtd-utils_20050414.bb
+++ b/packages/mtd/mtd-utils-native_20050521.bb
diff --git a/packages/mtd/mtd-utils_20050521.bb b/packages/mtd/mtd-utils_20050521.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mtd/mtd-utils_20050521.bb
diff --git a/packages/phalanx/phalanx_22.bb b/packages/phalanx/phalanx_22.bb
index 02408d5b12..fda5e4cbca 100644
--- a/packages/phalanx/phalanx_22.bb
+++ b/packages/phalanx/phalanx_22.bb
@@ -10,8 +10,6 @@ SRC_URI = "http://dusan.freeshell.org/phalanx/phalanx-${PV}.tar.gz \
            file://description"
 S = "${WORKDIR}/Phalanx-XXII"
 
-palmtopdir = "/opt/QtPalmtop"
-
 do_compile() {
 	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" STRIP=echo LD="${CC}"
 }