merge of 57c7ff1bca3e3d0423fe776b6cdf466b16f29e50

     and d2393507d64bd7596d8c8cf859ad39de4bc4ed65

5 files changed, 28 insertions, 8 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b2d7e2b875..2d739f3bcc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -139,7 +139,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
 ##################################################################
 
 TMPDIR = "${TOPDIR}/tmp"
-CACHE = "${TMPDIR}/cache"
+CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
 DL_DIR = "${TMPDIR}/downloads"
 CVSDIR = "${DL_DIR}/cvs"
 SVNDIR = "${DL_DIR}/svn"
@@ -165,6 +165,7 @@ DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
+DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
 
 ##################################################################
 # Kernel info.
@@ -197,8 +198,6 @@ EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
 EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384"
-IMAGE_ROOTFS_SIZE_ext2 = "65536"
-IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
 IMAGE_DEPENDS = ""
 IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
@@ -419,7 +418,8 @@ require conf/sanity.conf
 IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
 MACHINE_TASK_PROVIDER ?= "task-bootstrap"
-
+IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
 
 ##################################################################
 # Magic Cookie for SANITY CHECK
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index f593194ba6..05acebfa8f 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -33,7 +33,7 @@ FEED_ARCH_akita		= "armv5te"
 FEED_ARCH_c7x0		= "armv5te"
 FEED_ARCH_h2200		= "armv5te"
 FEED_ARCH_h4000		= "armv5te"
-FEED_ARCH_h5xxx		= "armv5te"
+FEED_ARCH_h5000		= "armv5te"
 FEED_ARCH_htcuniversal 	= "armv5te"
 FEED_ARCH_hx2000	= "armv5te"
 FEED_ARCH_hx4700	= "armv5te"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5000.conf
index 5aac579e91..ffc1328f50 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5000.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx"
 
 require conf/machine/include/tune-xscale.conf
 
@@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p"
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf
new file mode 100644
index 0000000000..77961714eb
--- /dev/null
+++ b/conf/machine/mx21ads.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Freescale MX21ADS
+#@DESCRIPTION: Machine configuration for Freescale MX21ADS 
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+include conf/machine/include/tune-arm926ejs.conf
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 6f30cd24ea..58313f27ca 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -3,6 +3,6 @@
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.4.2"
+BB_MIN_VERSION = "1.6.2"
 INHERIT += "sanity"