merge of 'aac60b186b977130a688c4d00bfde913fb6221eb'

and 'f42403739ba7106ebfe92b3af59bf9c81b54f06d'
author: Leon Woestenberg <leon.woestenberg@gmail.com> 2007-10-05 12:43:03 +0000
committer: Leon Woestenberg <leon.woestenberg@gmail.com> 2007-10-05 12:43:03 +0000
commit: fb5a8ff3d88fca827e22ad48f136c7fe1c6cea10 (patch)
tree: f28b9b4a860576cf9909d567efc7baeb20dd2740
parent: f0f72d8aa5de6a41796117c6e781e150bbacbe47 (diff)
parent: bab0c48ac5132ad63b4f3da27a1c39c20b5db86c (diff)
295 files changed, 5458 insertions, 10687 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7533c3f8fc..f58a2d8960 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -39,7 +39,7 @@ Mail:       cbrake@bec-systems.com
 Website:    http://bec-systems.com
 Interests:  Support in OE for single board computers, web application support
 Machines:   compulab-pxa270, logicpd-pxa270, 
-Recipes:    mono
+Recipes:    mono argtable
 
 Person:     Erik Hovland
 Mail:       erik@hovland.org
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index 56233578aa..b29d86cefd 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -1,6 +1,6 @@
 def gnome_verdir(v):
 	import re
-	m = re.match("([0-9]+)\.([0-9]+)\..*", v)
+	m = re.match("^([0-9]+)\.([0-9]+)", v)
 	return "%s.%s" % (m.group(1), m.group(2))
 
 SECTION ?= "x11/gnome"
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index d54d6c7b9e..83f8c43bba 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -101,7 +101,7 @@ def package_qa_get_elf(path, bits32):
         def my_assert(expectation, result):
             if not expectation == result:
                 #print "'%x','%x'" % (ord(expectation), ord(result))
-                raise "This does not work as expected"
+                raise Exception("This does not work as expected")
         my_assert = staticmethod(my_assert)
 
         def __init__(self, name):
@@ -124,13 +124,13 @@ def package_qa_get_elf(path, bits32):
 
             self.sex = self.data[ELFFile.EI_DATA]
             if self.sex == chr(ELFFile.ELFDATANONE):
-                raise "Can't be"
+                raise Exception("self.sex == ELFDATANONE")
             elif self.sex == chr(ELFFile.ELFDATA2LSB):
                 self.sex = "<"
             elif self.sex == chr(ELFFile.ELFDATA2MSB):
                 self.sex = ">"
             else:
-                raise "Even more worse"
+                raise Exception("Unknown self.sex")
 
         def osAbi(self):
             return ord(self.data[ELFFile.EI_OSABI])
@@ -376,7 +376,7 @@ def package_qa_check_rdepends(pkg, workdir, d):
 
         bb.data.setVar('ROOT', '', localdata) 
         bb.data.setVar('ROOT_%s' % pkg, root, localdata)
-        pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
+        pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, True)
         if not pkgname:
             pkgname = pkg
         bb.data.setVar('PKG', pkgname, localdata)
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index b25275e702..5976f42c71 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -142,6 +142,7 @@ kernel_do_install() {
 	install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
 	install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
 	install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
+	install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
 	install -d ${D}/etc/modutils
 	if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then
 		install -d ${D}/etc/modprobe.d
@@ -160,6 +161,18 @@ kernel_do_configure() {
         yes '' | oe_runmake oldconfig
 }
 
+do_menuconfig() {
+	export TERMWINDOWTITLE="${PN} Kernel Configuration"
+	export SHELLCMDS="make menuconfig"
+	${TERMCMDRUN}
+	if [ $? -ne 0 ]; then
+		echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
+		exit 1
+	fi
+}
+do_menuconfig[nostamp] = "1"
+addtask menuconfig after do_patch
+
 pkg_postinst_kernel () {
 	cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
 }
@@ -174,10 +187,11 @@ EXPORT_FUNCTIONS do_compile do_install do_stage do_configure
 
 # kernel-base becomes kernel-${KERNEL_VERSION}
 # kernel-image becomes kernel-image-${KERNEL_VERISON}
-PACKAGES = "kernel kernel-base kernel-image kernel-dev"
+PACKAGES = "kernel kernel-base kernel-image kernel-dev kernel-vmlinux"
 FILES = ""
 FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 FILES_kernel-dev = "/boot/System.map* /boot/config*"
+FILES_kernel-vmlinux = "/boot/vmlinux*"
 RDEPENDS_kernel = "kernel-base"
 # Allow machines to override this dependency if kernel image files are 
 # not wanted in images as standard
diff --git a/classes/mono.bbclass b/classes/mono.bbclass
new file mode 100644
index 0000000000..c50274ed0c
--- /dev/null
+++ b/classes/mono.bbclass
@@ -0,0 +1,218 @@
+def mono_get_file_table(packageversion, d):
+	# The packageversion is currently ignored, but might be used in the future
+	# if more than one mono version is available and different versions
+	# need to use different tables
+
+ 	import bb, sys, os, glob, commands
+	curdir = os.path.dirname( bb.data.getVar('FILE', d, 1)  )
+	if curdir not in sys.path: sys.path.append( curdir )
+	from mono_files import debian_mono_file_table
+	
+	# mono-jay is not being built (for all platforms at least)
+	IGNORE = ("mono-jay", )
+	file_table = [
+	    # Standard package
+	    {"name": "mono-doc"},
+	    
+	    # Virtual packages
+	    {"name": "mono"},
+	    {"name": "mono-runtime"},
+	    
+	    # Not provided by Debian:
+	    {"name": "libnunit2.2-cil",
+	     "patterns": [
+	       "/usr/lib/mono/gac/nunit.*/2.2.*",
+	       "/usr/lib/mono/1.0/nunit.*.dll",
+	       "/usr/lib/pkgconfig/mono-nunit.pc",
+	      ],
+	      "assemblies": [
+	       ("nunit.core", "2.2.0.0"),
+	       ("nunit.framework", "2.2.0.0"),
+	       ("nunit.util", "2.2.0.0"),
+	       ("nunit.mocks", "2.2.8.0"),
+	      ],
+	    },
+	    {"name": "libmono-cecil0.5-cil",
+	     "patterns": [
+	      "/usr/lib/mono/gac/Mono.Cecil/0.5.*",
+	     ],
+	     "assemblies": [
+	      ("Mono.Cecil", "0.5.*"),
+	     ],
+	    },
+	    {"name": "libmono-db2-1.0-cil",
+	     "patterns": [
+	      "/usr/lib/mono/gac/IBM.Data.DB2/1.0*",
+	      "/usr/lib/mono/1.0/IBM.Data.DB2.dll",
+	     ],
+	     "assemblies": [
+	      ("IBM.Data.DB2", "1.0*"),
+	     ],
+	    },
+	] + debian_mono_file_table
+	
+	file_table = [e for e in file_table
+		if not (e.has_key("name") and e["name"] in IGNORE)]
+	
+	return file_table
+
+def mono_find_provides_and_requires(files, d):
+	provides = []
+	requires = []
+	
+	import bb, os, commands
+	
+	pathprefix = "export PATH=%s; export LANG=; export LC_ALL=; " % bb.data.getVar('PATH', d, 1)
+	for filename in files:
+		if not filename.endswith(".dll") and not filename.endswith(".exe"):
+			continue
+		if not os.path.isfile(filename) or os.path.islink(filename):
+			continue
+		
+		## Provides
+		name, version = None, None
+		
+		ret, result = commands.getstatusoutput("%smonodis --assembly '%s'" % (pathprefix, filename))
+		if ret:
+			bb.error("raw_provides_and_requires: monodis --assembly '%s' failed, dependency information will be inaccurate" % filename)
+			continue
+		for line in result.splitlines():
+			if not ":" in line: continue
+			key, value = line.split(":", 1)
+			if key.strip() == "Name":
+				name = value.strip()
+			elif key.strip() == "Version":
+				version = value.strip()
+		if name is not None and version is not None:
+			if (name, version) not in provides:
+				provides.append( (name, version) )
+	
+		## Requires
+		name, version = None, None
+		ret, result = commands.getstatusoutput("%smonodis --assemblyref '%s'" % (pathprefix, filename))
+		if ret:
+			bb.error("raw_provides_and_requires: monodis --assemblyref '%s' failed, dependency information will be inaccurate" % filename)
+			continue
+		for line in result.splitlines():
+			if not "=" in line: continue
+			key, value = line.split("=", 1)
+			if ":" in key and key.split(":",1)[1].strip() == "Version":
+				version = value.strip()
+			elif key.strip() == "Name":
+				name = value.strip()
+        		if name is not None and version is not None:
+				if (name, version) not in requires:
+					requires.append( (name, version) )
+				name, version = None, None
+	
+	# Remove everything from requires that's already in provides as it's not actually required
+	# to be provided externally
+	requires = [e for e in requires if not e in provides]
+	return provides, requires
+
+python mono_do_clilibs() {
+	import bb, os, re, os.path
+
+	exclude_clilibs = bb.data.getVar('EXCLUDE_FROM_CLILIBS', d, 0)
+	if exclude_clilibs:
+		bb.note("not generating clilibs")
+		return
+		
+	lib_re = re.compile("^lib.*\.so")
+	libdir_re = re.compile(".*/lib$")
+
+	packages = bb.data.getVar('PACKAGES', d, 1)
+
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	if not workdir:
+		bb.error("WORKDIR not defined")
+		return
+
+	staging = bb.data.getVar('STAGING_DIR', d, 1)
+	if not staging:
+		bb.error("STAGING_DIR not defined")
+		return
+
+	pkgdest = bb.data.getVar('PKGDEST', d, 1)
+
+	clilibs_dir = os.path.join(staging, "clilibs")
+	bb.mkdirhier(clilibs_dir)
+
+	provides, requires = {}, {}
+	private_libs = bb.data.getVar('PRIVATE_CLILIBS', d, 1)
+	for pkg in packages.split():
+		bb.debug(2, "calculating clilib provides for %s" % pkg)
+
+		files_to_check = []
+		top = os.path.join(pkgdest, pkg)
+		for root, dirs, files in os.walk(top):
+			for file in files:
+				path = os.path.join(root, file)
+				if file.endswith(".exe") or file.endswith(".dll"):
+					files_to_check.append( path )
+		provides[pkg], requires[pkg] = mono_find_provides_and_requires(files_to_check, d)
+		clilibs_file = os.path.join(clilibs_dir, pkg + ".list")
+		if os.path.exists(clilibs_file):
+			os.remove(clilibs_file)
+		if len(provides[pkg]) > 0:
+			fd = open(clilibs_file, 'w')
+			for s in provides[pkg]:
+				fd.write(" ".join(s) + '\n')
+			fd.close()
+
+	clilib_provider = {}
+	list_re = re.compile('^(.*)\.list$')
+	for file in os.listdir(clilibs_dir):
+		m = list_re.match(file)
+		if m:
+			dep_pkg = m.group(1)
+			fd = open(os.path.join(clilibs_dir, file))
+			lines = fd.readlines()
+			fd.close()
+			for l in lines:
+				clilib_provider[tuple(l.rstrip().split())] = dep_pkg
+
+	for pkg in packages.split():
+		bb.debug(2, "calculating clilib requirements for %s" % pkg)
+
+		deps = []
+		for n in requires[pkg]:
+			if n in clilib_provider.keys():
+				dep_pkg = clilib_provider[n]
+
+				if dep_pkg == pkg:
+					continue
+				
+				if not dep_pkg in deps:
+					deps.append(dep_pkg)
+			else:
+				bb.note("Couldn't find CLI library provider for %s" % (n,))
+
+		deps_file = os.path.join(pkgdest, pkg + ".clilibdeps")
+		if os.path.exists(deps_file):
+			os.remove(deps_file)
+		if len(deps) > 0:
+			fd = open(deps_file, 'w')
+			for dep in deps:
+				fd.write(dep + '\n')
+			fd.close()
+}
+
+def mono_after_parse(d):
+	import bb
+	# Insert mono_do_clilibs into PACKAGEFUNCS
+	# Needs to be called after populate_packages, but before read_shlibdeps
+	PACKAGEFUNCS = bb.data.getVar("PACKAGEFUNCS", d, 1)
+	if PACKAGEFUNCS:
+		PACKAGEFUNCS = PACKAGEFUNCS.split()
+		if "read_shlibdeps" in PACKAGEFUNCS:
+			i = PACKAGEFUNCS.index("read_shlibdeps")
+			PACKAGEFUNCS.insert(i, "mono_do_clilibs")
+		elif "populate_packages" in PACKAGEFUNCS:
+			i = PACKAGEFUNCS.index("populate_packages")
+			PACKAGEFUNCS.insert(i+1, "mono_do_clilibs")
+		bb.data.setVar("PACKAGEFUNCS", " ".join(PACKAGEFUNCS), d)
+
+python () {
+    mono_after_parse(d)
+}
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 5233fa363c..b114049b8e 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -128,11 +128,12 @@ python () {
             deps += " %s:do_populate_staging" % dep
         bb.data.setVarFlag('do_package', 'depends', deps, d)
 
+        deps = (bb.data.getVarFlag('do_package', 'deptask', d) or "").split()
         # shlibs requires any DEPENDS to have already packaged for the *.list files
-        bb.data.setVarFlag('do_package', 'deptask', 'do_package', d)
+        deps.append("do_package")
+        bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d)
 }
 
-
 def runstrip(file, d):
     # Function to strip a single file, called from populate_packages below
     # A working 'file' (one which works on the target architecture)
@@ -481,6 +482,8 @@ python populate_packages () {
 populate_packages[dirs] = "${D}"
 
 python emit_pkgdata() {
+	from glob import glob
+
 	def write_if_exists(f, pkg, var):
 		def encode(str):
 			import codecs
@@ -492,14 +495,14 @@ python emit_pkgdata() {
 			f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
 
 	packages = bb.data.getVar('PACKAGES', d, 1)
-	if not packages:
-		return
 
 	data_file = bb.data.expand("${PKGDATA_DIR}/${PN}", d)
 	f = open(data_file, 'w')
 	f.write("PACKAGES: %s\n" % packages)
 	f.close()
 
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+
 	for pkg in packages.split():
 		subdata_file = bb.data.expand("${PKGDATA_DIR}/runtime/%s" % pkg, d)
 		sf = open(subdata_file, 'w')
@@ -519,6 +522,13 @@ python emit_pkgdata() {
 		write_if_exists(sf, pkg, 'pkg_preinst')
 		write_if_exists(sf, pkg, 'pkg_prerm')
 		sf.close()
+
+		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1)
+		root = "%s/install/%s" % (workdir, pkg)
+		os.chdir(root)
+		g = glob('*')
+		if g or allow_empty == "1":
+			file(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), 'w').close()
 }
 emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
 
@@ -540,9 +550,6 @@ python package_do_shlibs() {
 	libdir_re = re.compile(".*/lib$")
 
 	packages = bb.data.getVar('PACKAGES', d, 1)
-	if not packages:
-		bb.debug(1, "no packages to build; not calculating shlibs")
-		return
 
 	workdir = bb.data.getVar('WORKDIR', d, 1)
 	if not workdir:
@@ -678,9 +685,6 @@ python package_do_pkgconfig () {
 	import re, os
 
 	packages = bb.data.getVar('PACKAGES', d, 1)
-	if not packages:
-		bb.debug(1, "no packages to build; not calculating pkgconfig dependencies")
-		return
 
 	workdir = bb.data.getVar('WORKDIR', d, 1)
 	if not workdir:
@@ -786,23 +790,17 @@ python package_do_pkgconfig () {
 }
 
 python read_shlibdeps () {
-	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
 	for pkg in packages:
 		rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
-		shlibsfile = bb.data.expand("${PKGDEST}/" + pkg + ".shlibdeps", d)
-		if os.access(shlibsfile, os.R_OK):
-			fd = file(shlibsfile)
-			lines = fd.readlines()
-			fd.close()
-			for l in lines:
-				rdepends.append(l.rstrip())
-		pcfile = bb.data.expand("${PKGDEST}/" + pkg + ".pcdeps", d)
-		if os.access(pcfile, os.R_OK):
-			fd = file(pcfile)
-			lines = fd.readlines()
-			fd.close()
-			for l in lines:
-				rdepends.append(l.rstrip())
+		for extension in ".shlibdeps", ".pcdeps", ".clilibdeps":
+			depsfile = bb.data.expand("${PKGDEST}/" + pkg + extension, d)
+			if os.access(depsfile, os.R_OK):
+				fd = file(depsfile)
+				lines = fd.readlines()
+				fd.close()
+				for l in lines:
+					rdepends.append(l.rstrip())
 		bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d)
 }
 
@@ -896,6 +894,11 @@ PACKAGEFUNCS ?= "package_do_split_locales \
 		emit_pkgdata"
 
 python package_do_package () {
+	packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+	if len(packages) < 1:
+		bb.debug(1, "No packages to build, skipping do_package")
+		return
+
 	for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split():
 		bb.build.exec_func(f, d)
 }
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index 2ab537f174..b85ffe254f 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -8,6 +8,14 @@ BOOTSTRAP_EXTRA_RDEPENDS += "dpkg"
 DISTRO_EXTRA_RDEPENDS += "dpkg"
 IMAGE_PKGTYPE ?= "deb"
 
+# Map TARGET_ARCH to Debian's ideas about architectures
+DPKG_ARCH ?= "${TARGET_ARCH}" 
+DPKG_ARCH_x86 ?= "i386"
+DPKG_ARCH_i486 ?= "i386"
+DPKG_ARCH_i586 ?= "i386"
+DPKG_ARCH_i686 ?= "i386"
+DPKG_ARCH_pentium ?= "i386"
+
 python package_deb_fn () {
     from bb import data
     bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
@@ -38,7 +46,7 @@ python do_package_deb_install () {
     if (exitstatus != 0 ):
         raise bb.build.FuncFailed(output)
 
-    f = open(os.path.join(tmpdir, "stamps", "do_packages"), "w")
+    f = open(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"), "w")
     f.close()
 
     # NOTE: this env stuff is racy at best, we need something more capable
@@ -86,9 +94,9 @@ python do_package_deb () {
         return
 
     tmpdir = bb.data.getVar('TMPDIR', d, 1)
-    # Invalidate the packages file
-    if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK):
-        os.unlink(os.path.join(tmpdir, "stamps", "do_packages"))
+
+    if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
+        os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
 
     if packages == []:
         bb.debug(1, "No packages; nothing to do")
@@ -141,6 +149,7 @@ python do_package_deb () {
             note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
             unlockfile(lf)
             continue
+
         controldir = os.path.join(root, 'DEBIAN')
         bb.mkdirhier(controldir)
         os.chmod(controldir, 0755)
@@ -161,7 +170,7 @@ python do_package_deb () {
         fields.append(["Section: %s\n", ['SECTION']])
         fields.append(["Priority: %s\n", ['PRIORITY']])
         fields.append(["Maintainer: %s\n", ['MAINTAINER']])
-        fields.append(["Architecture: %s\n", ['TARGET_ARCH']])
+        fields.append(["Architecture: %s\n", ['DPKG_ARCH']])
         fields.append(["OE: %s\n", ['PN']])
         fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
@@ -175,7 +184,7 @@ python do_package_deb () {
                 data = bb.data.getVar(i, d, 1)
                 if data is None:
                     raise KeyError(f)
-		if i == 'TARGET_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all':
+		if i == 'DPKG_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all':
                     data = 'all'
                 l2.append(data)
             return l2
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 0b7f274a96..a12899e2a1 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -49,11 +49,11 @@ python package_ipk_install () {
 
 
 	if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or
-		not os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK):
+		not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),os.R_OK):
 		ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
 		if (ret != 0 ):
 			raise bb.build.FuncFailed
-		f=open(os.path.join(tmpdir, "stamps", "do_packages"),"w")
+		f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w")
 		f.close()
 
 	ret = os.system('ipkg-cl  -o %s -f %s update' % (rootfs, conffile))
@@ -143,9 +143,9 @@ python do_package_ipk () {
 		return
 
 	tmpdir = bb.data.getVar('TMPDIR', d, 1)
-	# Invalidate the packages file
-	if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK):
-		os.unlink(os.path.join(tmpdir, "stamps", "do_packages"))
+
+	if os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"), os.R_OK):
+		os.unlink(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"))
 
 	if packages == []:
 		bb.debug(1, "No packages; nothing to do")
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 9b3c3fed11..3b14fd82a9 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -312,7 +312,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 PREFERRED_VERSION_busybox = "1.2.1"
 
 PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.72"
+PREFERRED_VERSION_dbus-glib ?= "0.74"
 
 PREFERRED_VERSION_wpa-supplicant = "0.5.5"
 
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
index 0ff684ed68..19ee48174d 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -277,6 +277,6 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
 
 # xserver
-PREFERRED_VERSION_xserver-kdrive ?= "1.4.0"
-PREFERRED_VERSION_xserver-xorg ?= "1.4.0"
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.4"
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 88e92d95b4..e26e7cf95e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -17,12 +17,12 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
-SRCREV_pn-hildon-1 ?= "13708"
-SRCREV_pn-libgsmd ?= "2957"
+SRCREV_pn-hildon-1 ?= "14173"
+SRCREV_pn-libgsmd ?= "3074"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
-SRCREV_pn-libmokoui2 ?= "3032"
+SRCREV_pn-libmokoui2 ?= "3064"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
@@ -33,31 +33,35 @@ SRCREV_pn-matchbox-desktop-2 ?= "1649"
 SRCREV_pn-matchbox-keyboard ?= "1675"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_moko-gtk-engine ?= "3029"
+SRCREV_pn-moko-gtk-engine ?= "3069"
 SRCREV_pn-neod ?= "2956"
 SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-osb-browser ?= "125"
+SRCREV_pn-osb-jscore ?= "117"
+SRCREV_pn-osb-nrcit ?= "125"
+SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-browser2 ?= "3031"
+SRCREV_pn-openmoko-browser2 ?= "3061"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "2789"
 SRCREV_pn-openmoko-common ?= "397"
 SRCREV_pn-openmoko-common2 ?= "2679"
 SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "335"
+SRCREV_pn-openmoko-contacts2 ?= "350"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "563"
+SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "2976"
-SRCREV_pn-openmoko-feedreader2 ?= "2944"
+SRCREV_pn-openmoko-dialer2 ?= "3073"
+SRCREV_pn-openmoko-feedreader2 ?= "3060"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"
 SRCREV_pn-openmoko-footer ?= "2354"
 SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "2952"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3057"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -65,7 +69,7 @@ SRCREV_pn-openmoko-panel-clock ?= "2567"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "2936"
+SRCREV_pn-openmoko-panel-gsm ?= "3074"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"
@@ -75,14 +79,14 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
 SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "320"
+SRCREV_pn-openmoko-tasks2 ?= "343"
 SRCREV_pn-openmoko-terminal2 ?= "2972"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "2964"
+SRCREV_pn-openmoko-theme-standard2 ?= "3044"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
-SRCREV_pn-openmoko-today ?= "2556"
-SRCREV_pn-openmoko-today2 ?= "2955"
+SRCREV_pn-openmoko-today ?= "3056"
+SRCREV_pn-openmoko-today2 ?= "3056"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
@@ -90,7 +94,9 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-settings-daemon ?= "1615"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
-SRCREV_pn-webkit-gtk ?= "25615"
+SRCREV_pn-webkit-gtk ?= "25808"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"
 
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 06d5946523..0f5eaca9cc 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -6,6 +6,8 @@ require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
+MACHINE_FEATURES += "iwmmxt"
+
 IMAGE_FSTYPES ?= "jffs2"
 
 ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index e6199f7e23..ff0eb42a11 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -11,19 +11,27 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 require conf/machine/include/tune-xscale.inc
 
+# console serial port.  If you have a L module
+# the below works.  If you have a W module, add
+# the following line to your local.conf:
+#   CMX270_CONSOLE_SERIAL_PORT = "ttyS0"
+
+# the following is for the cm-x270 L module
+CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
+
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting
 # the following is the for the cm-x270 L module
 # I think the W module would use ttyS0, but has
 # not been tested.  This can be overwritten in 
 # local.conf
-SERIAL_CONSOLE ?= "38400 ttyS1"
+SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}"
 
 # used by opie-collections.inc
 ROOT_FLASH_SIZE ?= "32"
 
 # for NAND flash.
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\
 	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
 	-e 0x20000 -p; \
@@ -37,12 +45,15 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa"
 # to program the compulab NAND flash, the following scheme is suggested.  Create
 # a small rootfs that can fit in NOR flash using the following config:
 #   - Angstrom distro
-#   - uclibc
+#   - uclibc (set ANGSTROM_MODE = "uclibc" in local.conf)
 #   - angstrom-minimal-image-with-mtd-utils bitbake target
 #   - put the following in your local.conf
 #     - IMAGE_FSTYPES = "jffs2 tar cpio.gz"
 # now, when you build the image, a cpio.gz will be generated
 # that can be used as an initramfs.  You can boot into this image and then
 # program the main rootfs jffs2 image in NAND flash using mtd-utils
+# you can select booting the initramfs, or the main nand rootfs by using
+# the "ramdisk on", or "ramdisk off" commands in the bootloader
+#
 
 
diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf
new file mode 100644
index 0000000000..211091d929
--- /dev/null
+++ b/conf/machine/er0100.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: iRex Iliad e-ink reader
+#@DESCRIPTION: Machine configuration for the iRex Iliad e-ink reader
+
+#
+# Hardware-based properties
+#
+
+# CPU: Intel (now Marvell) PXA255
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.inc
+
+# Fix us:
+
+#ROOT_FLASH_SIZE = "80"
+#VOLATILE_STORAGE_SIZE = "64"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "768"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "1024"
+MACHINE_FEATURES = "kernel24 touchscreen apm alsa pcmcia wifi usbgadget usbhost screen"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-er0100"
+PCMCIA_MANAGER = "pcmcia-cs"
+MODUTILS = "24"	
+XSERVER = "xserver-kdrive-fbdev"
+
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_evdev = "evdev"
+module_autoload_pcmcia = "pcmcia"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+USE_VT = "0"
+SERIAL_CONSOLE = "-L ttyS2 115200 vt100"
+
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index 6aa1885293..44454f3902 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 634b388f96..c3e7cf710e 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -18,6 +18,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone"
+MACHINE_FEATURES += "iwmmxt"
 
 #
 # Software/packages selection
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 141470b5a4..87e03a7bdd 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -20,6 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
+MACHINE_FEATURES += "iwmmxt"
 
 #
 # Software/packages selection
@@ -29,7 +30,6 @@ PCMCIA_MANAGER = "pcmciautils"
 MODUTILS = "26"	
 
 XSERVER = "xserver-kdrive-w100"
-PREFERRED_VERSION_xserver-kdrive = "1.2.0"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 4f66f92cf0..fc5fd4e136 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -13,6 +13,7 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_gumstix_gadget = "gumstix_gadget"
 module_autoload_g_ether = "g_ether"
 module_autoload_smc91x = "smc91x"
+module_autoload_smc911x = "smc911x"
 
 UBOOT_ENTRYPOINT = "a0008000"
 
@@ -33,8 +34,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-sysfs \
                              kernel-module-smc91x \
                              kernel-module-gumstix-smc91x \
-                             "          
-
+                             kernel-module-smc911x \
+                             kernel-module-gumstix-smc911x \
+                             "
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 3912d8fc9b..87571c0db0 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -12,6 +12,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 #mtd3: 00020000 00020000 "Logo"
 
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
+
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_DISPLAY_ORIENTATION = "0"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 60cc9af3d1..f7451cccb0 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -20,6 +20,8 @@ MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost"
+MACHINE_FEATURES += "iwmmxt"
+
 
 #
 # We don't support jffs2 installations (yet).
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index 2f92eb4158..bbeaf3a4a2 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -10,6 +10,7 @@ MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "320"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
+MACHINE_FEATURES += "iwmmxt"
 
 
 MACHINE_EXTRA_RRECOMMENDS += "\
diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf
index 621e95f166..1a99c877ce 100644
--- a/conf/machine/rokre2.conf
+++ b/conf/machine/rokre2.conf
@@ -6,3 +6,5 @@ require conf/machine/include/motorola-ezx-base.inc
 
 # there is no touchscreen
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
+MACHINE_FEATURES += "iwmmxt"
+
diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf
index 7b20091140..044a65c9fa 100644
--- a/conf/machine/rokre6.conf
+++ b/conf/machine/rokre6.conf
@@ -4,5 +4,3 @@
 
 require conf/machine/include/motorola-ezx-base.inc
 
-# there is no touchscreen
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 3199065606..32060d090c 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -5,6 +5,8 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
+MACHINE_FEATURES += "iwmmxt"
+
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
index 42fc6c7d6e..09f61d0534 100644
--- a/packages/abiword/abiword-2.5.inc
+++ b/packages/abiword/abiword-2.5.inc
@@ -13,10 +13,10 @@ SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,
 
 FILES_${PN} += " \
 		${datadir}/icons/* \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/glade \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \
+		${datadir}/abiword-${SHRT_VER}/glade \
+		${datadir}/abiword-${SHRT_VER}/scripts \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
 #		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
 #		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index 5fcc1dd1a2..9741ad6413 100644
--- a/packages/abiword/abiword_2.5.1.bb
+++ b/packages/abiword/abiword_2.5.1.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
+PR = "r2"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.5.2.bb b/packages/abiword/abiword_2.5.2.bb
index 66d8fae0ad..5fcc1dd1a2 100644
--- a/packages/abiword/abiword_2.5.2.bb
+++ b/packages/abiword/abiword_2.5.2.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
+PR = "r1"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index a2eda707f1..1561ec003d 100644
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r35"
-ALLOW_EMPTY = "1"
+PR = "r36"
+
+inherit task
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
diff --git a/packages/dbus/dbus-glib-0.72/.mtn2git_empty b/packages/argtable/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-glib-0.72/.mtn2git_empty
+++ b/packages/argtable/.mtn2git_empty
diff --git a/packages/argtable/argtable_2.7.bb b/packages/argtable/argtable_2.7.bb
new file mode 100644
index 0000000000..ee3e6bd70a
--- /dev/null
+++ b/packages/argtable/argtable_2.7.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Argtable is an ANSI C library for parsing GNU style command line options."
+SECTION = "libs"
+LICENSE = "LGPL"
+HOMEPAGE = "http://argtable.sourceforge.net/"
+
+PR = "r1"
+
+DEPENDS = "libtool-cross"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/argtable/argtable2-7.tar.gz"
+
+S = ${WORKDIR}/argtable2-7
+
+inherit autotools
+
+do_stage () {
+	oe_libinstall -a -so libargtable2 ${STAGING_LIBDIR}
+	install -m 0644 src/argtable2.h ${STAGING_INCDIR}
+}
+
+
diff --git a/packages/atk/atk_1.19.3.bb b/packages/atk/atk_1.19.3.bb
index beef4ce97a..52136682d7 100644
--- a/packages/atk/atk_1.19.3.bb
+++ b/packages/atk/atk_1.19.3.bb
@@ -1,7 +1,5 @@
 require atk.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
 
 do_stage () {
diff --git a/packages/atk/atk_1.20.0.bb b/packages/atk/atk_1.20.0.bb
new file mode 100644
index 0000000000..e2733d5b87
--- /dev/null
+++ b/packages/atk/atk_1.20.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "glib-2.0 gtk-doc"
+
+SRC_URI = "http://download.gnome.org/sources/atk/1.20/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/fic-gta01/fstab
index d2976a4205..4a0cc7750d 100644
--- a/packages/base-files/base-files/fic-gta01/fstab
+++ b/packages/base-files/base-files/fic-gta01/fstab
@@ -12,7 +12,7 @@ tmpfs		/dev/shm		tmpfs	mode=0777			0  0
 tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
-/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
+/dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
 
 # USB Storage
 /dev/sda1 /media/hdd         vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/fic-gta02/fstab
index d2976a4205..4a0cc7750d 100644
--- a/packages/base-files/base-files/fic-gta02/fstab
+++ b/packages/base-files/base-files/fic-gta02/fstab
@@ -12,7 +12,7 @@ tmpfs		/dev/shm		tmpfs	mode=0777			0  0
 tmpfs		/media/ram	tmpfs	defaults		0  0
 
 # microSD slot
-/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto	0  0
+/dev/mmcblk0p1	/media/card	auto	defaults,async,noauto	0  0
 
 # USB Storage
 /dev/sda1 /media/hdd         vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab
index 8243195d99..5063f84359 100644
--- a/packages/base-files/base-files/h2200/fstab
+++ b/packages/base-files/base-files/h2200/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock3	/		jffs2	defaults	1  1		
+rootfs		/		auto	defaults	1  1		
 proc            /proc		proc    defaults        0  0
 sys             /sys		sysfs	defaults        0  0
 tmpfs		/var/volatile	tmpfs	mode=0755	0  0
diff --git a/packages/base-files/base-files/h3600/fstab b/packages/base-files/base-files/h3600/fstab
index 92293a59af..9ec7df1928 100644
--- a/packages/base-files/base-files/h3600/fstab
+++ b/packages/base-files/base-files/h3600/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock4	/ 	jffs2	defaults	1  1 
+rootfs		/ 		auto	defaults	1  1 
 proc            /proc   proc    defaults        0  0
 /dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
 /dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
diff --git a/packages/base-files/base-files/h3900/fstab b/packages/base-files/base-files/h3900/fstab
index 2a106ef945..9ec7df1928 100644
--- a/packages/base-files/base-files/h3900/fstab
+++ b/packages/base-files/base-files/h3900/fstab
@@ -1,6 +1,4 @@
-/dev/mtdblock/1	/ 	jffs2	defaults	1  1 
-#breaks h51xx
-#/dev/mtdblock/2 /home   jffs2   defaults        1  1
+rootfs		/ 		auto	defaults	1  1 
 proc            /proc   proc    defaults        0  0
 /dev/hda1	/media/cf	auto	defaults,noauto,noatime,user,exec,suid	0  0
 /dev/mmc/part1	/media/card	auto	defaults,noauto,noatime,user,exec,suid	0  0
diff --git a/packages/base-files/base-files/h5000/fstab b/packages/base-files/base-files/h5000/fstab
index 4d3c38eca8..ad05f3b799 100644
--- a/packages/base-files/base-files/h5000/fstab
+++ b/packages/base-files/base-files/h5000/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock1	/ 	jffs2	defaults	1  1 
+rootfs		/ 	auto	defaults	1  1 
 #breaks h51xx
 /dev/mtdblock2 /home   jffs2   defaults        1  1
 proc            /proc   proc    defaults        0  0
diff --git a/packages/base-files/base-files/hx4700/fstab b/packages/base-files/base-files/hx4700/fstab
index 04ac4849fd..49b5c96030 100644
--- a/packages/base-files/base-files/hx4700/fstab
+++ b/packages/base-files/base-files/hx4700/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock2 	/		jffs2	defaults		1  1		
+rootfs	 	/		auto	defaults		1  1		
 /dev/mtdblock3 	/home   jffs2   defaults        1  1
 
 proc            /proc		proc    defaults        0  0
diff --git a/packages/base-files/base-files/jornada56x/fstab b/packages/base-files/base-files/jornada56x/fstab
index d8258a0c05..de6e192fa1 100644
--- a/packages/base-files/base-files/jornada56x/fstab
+++ b/packages/base-files/base-files/jornada56x/fstab
@@ -1,4 +1,4 @@
-/dev/mtdblock1	/ 	jffs2	rw,noatime	1  1 
+rootfs		/	auto	rw,noatime	1  1 
 proc		/proc	proc	defaults	0  0
 /dev/hda1	/mnt/cf	auto	defaults,sync,noauto	0  0
 tmpfs		/var/volatile	tmpfs	mode=0755	0  0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 0d3a411095..7ccd26b5cf 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r72"
+PR = "r74"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb
index d3f6509151..ada747600e 100644
--- a/packages/cairo/cairo-directfb_1.4.8.bb
+++ b/packages/cairo/cairo-directfb_1.4.8.bb
@@ -1,5 +1,6 @@
 require cairo.inc
-
+RCONFLICTS = "cairo"
+RPROVIDES = "cairo-directfb"
 DEPENDS = "directfb libsm libpng fontconfig"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 	   file://cairo_directfb_is_similar-typo.patch;patch=1 \
@@ -12,6 +13,6 @@ EXTRA_OECONF += " --enable-directfb \
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
-PR = "r0"
+PR = "r2"
 
 S = "${WORKDIR}/cairo-${PV}"
diff --git a/packages/dbus/dbus-1.0.2/dbus-1.init b/packages/dbus/dbus-1.0.2/dbus-1.init
index 46e321860d..0725083c69 100644
--- a/packages/dbus/dbus-1.0.2/dbus-1.init
+++ b/packages/dbus/dbus-1.0.2/dbus-1.init
@@ -62,6 +62,7 @@ start_it_up()
 shut_it_down()
 {
   if [ -d $EVENTDIR ]; then
+      # TODO: --reverse when busybox supports it
       run-parts --arg=stop $EVENTDIR
   fi
   echo -n "Stopping $DESC: "
@@ -75,6 +76,16 @@ shut_it_down()
   rm -f $PIDFILE
 }
 
+reload_it()
+{
+  echo -n "Reloading $DESC config: "
+  dbus-send --print-reply --system --type=method_call \
+            --dest=org.freedesktop.DBus \
+            / org.freedesktop.DBus.ReloadConfig > /dev/null
+  # hopefully this is enough time for dbus to reload it's config file.
+  echo "done."
+}
+
 case "$1" in
   start)
     start_it_up
@@ -82,13 +93,16 @@ case "$1" in
   stop)
     shut_it_down
   ;;
-  restart|force-reload)
+  reload|force-reload)
+    reload_it
+  ;;
+  restart)
     shut_it_down
     sleep 1
     start_it_up
   ;;
   *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
     exit 1
   ;;
 esac
diff --git a/packages/dbus/dbus-glib-0.72/cross.patch b/packages/dbus/dbus-glib-0.72/cross.patch
deleted file mode 100644
index b3f41c8507..0000000000
--- a/packages/dbus/dbus-glib-0.72/cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: dbus-glib-0.72/configure.ac
-===================================================================
---- dbus-glib-0.72.orig/configure.ac	2006-10-27 10:05:05.000000000 +0200
-+++ dbus-glib-0.72/configure.ac	2006-10-27 10:05:48.000000000 +0200
-@@ -571,6 +571,7 @@
-     exit (0);
- ]])],
-               [have_abstract_sockets=yes],
-+              [have_abstract_sockets=no],
-               [have_abstract_sockets=no])
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)
diff --git a/packages/dbus/dbus-glib-native-0.72/.mtn2git_empty b/packages/dbus/dbus-glib-0.74/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-glib-native-0.72/.mtn2git_empty
+++ b/packages/dbus/dbus-glib-0.74/.mtn2git_empty
diff --git a/packages/dbus/dbus-glib/no-examples.patch b/packages/dbus/dbus-glib-0.74/no-examples.patch
index 483153db74..483153db74 100644
--- a/packages/dbus/dbus-glib/no-examples.patch
+++ b/packages/dbus/dbus-glib-0.74/no-examples.patch
diff --git a/packages/dbus/dbus-glib-0.72/no-introspect.patch b/packages/dbus/dbus-glib-0.74/no-introspect.patch
index 607f0acc9c..9115801f71 100644
--- a/packages/dbus/dbus-glib-0.72/no-introspect.patch
+++ b/packages/dbus/dbus-glib-0.74/no-introspect.patch
@@ -1,8 +1,8 @@
-Index: dbus-glib-0.72/tools/Makefile.am
+Index: dbus-glib-0.73/tools/Makefile.am
 ===================================================================
---- dbus-glib-0.72.orig/tools/Makefile.am	2006-10-25 21:10:36.000000000 +0200
-+++ dbus-glib-0.72/tools/Makefile.am	2006-10-27 10:07:35.000000000 +0200
-@@ -3,14 +3,8 @@
+--- dbus-glib-0.73.orig/tools/Makefile.am	2006-10-25 21:10:36.000000000 +0200
++++ dbus-glib-0.73/tools/Makefile.am	2006-10-27 10:07:35.000000000 +0200
+@@ -3,9 +3,6 @@
  nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
  libdbus_glibdir = $(includedir)/dbus-1.0/dbus
  
@@ -11,9 +11,4 @@ Index: dbus-glib-0.72/tools/Makefile.am
 -
  BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
  
--dbus-bus-introspect.xml:
--	DBUS_TOP_BUILDDIR=$(top_builddir) dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
--
- EXTRA_DIST = run-with-tmp-session-bus.sh session.conf
- 
- CLEANFILES = 				\
+ if USE_INTROSPECT_XML
diff --git a/packages/dbus/dbus-glib/.mtn2git_empty b/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-glib/.mtn2git_empty
+++ b/packages/dbus/dbus-glib-native-0.74/.mtn2git_empty
diff --git a/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch b/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
index ba117d0309..ba117d0309 100644
--- a/packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch
+++ b/packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb
deleted file mode 100644
index 1f5d71da91..0000000000
--- a/packages/dbus/dbus-glib-native_0.71.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "base"
-PR = "r0"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-
-SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://run-with-tmp-session-bus.patch;patch=1"
-
-inherit autotools pkgconfig gettext native
-
-S = "${WORKDIR}/dbus-glib-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib"
-DEPENDS = "glib-2.0-native dbus-native"
-
-do_stage() {
-        oe_runmake install
-        install -d ${STAGING_DATADIR}/dbus
-        install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
-        install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
-}
diff --git a/packages/dbus/dbus-glib-native_0.72.bb b/packages/dbus/dbus-glib-native_0.74.bb
index 90ecc4e9fe..d76cc043d4 100644
--- a/packages/dbus/dbus-glib-native_0.72.bb
+++ b/packages/dbus/dbus-glib-native_0.74.bb
@@ -1,11 +1,10 @@
 SECTION = "base"
-PR = "r1"
+PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
 	   file://run-with-tmp-session-bus.patch;patch=1"
 
 inherit autotools pkgconfig gettext native
@@ -19,5 +18,4 @@ do_stage() {
         install -d ${STAGING_DATADIR}/dbus
         install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
         install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
-	install -m 0755 dbus/.libs/dbus-binding-tool ${STAGING_BINDIR}/
 }
diff --git a/packages/dbus/dbus-glib/cross.patch b/packages/dbus/dbus-glib/cross.patch
deleted file mode 100644
index 6d1d9d8e7e..0000000000
--- a/packages/dbus/dbus-glib/cross.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- dbus-0.20/configure.in~cross
-+++ dbus-0.20/configure.in
-@@ -466,6 +466,7 @@
-     exit (0);
- ]])],
-               [have_abstract_sockets=yes],
-+              [have_abstract_sockets=no],
-               [have_abstract_sockets=no])
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)
diff --git a/packages/dbus/dbus-glib/no-introspect.patch b/packages/dbus/dbus-glib/no-introspect.patch
deleted file mode 100644
index 7057a63020..0000000000
--- a/packages/dbus/dbus-glib/no-introspect.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- dbus-glib-0.70/tools/Makefile.am.orig	2006-07-23 15:53:06.000000000 +0200
-+++ dbus-glib-0.70/tools/Makefile.am	2006-07-23 15:53:53.000000000 +0200
-@@ -3,14 +3,8 @@
- nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
- libdbus_glibdir = $(includedir)/dbus-1.0/dbus
- 
--dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
--	$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
--
- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
- 
--dbus-bus-introspect.xml:
--	DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
--
- EXTRA_DIST = run-with-tmp-session-bus.sh
- 
- CLEANFILES = 				\
diff --git a/packages/dbus/dbus-glib_0.71.bb b/packages/dbus/dbus-glib_0.71.bb
deleted file mode 100644
index 26bc851098..0000000000
--- a/packages/dbus/dbus-glib_0.71.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SECTION = "base"
-PR = "r0"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
-
-SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   file://no-examples.patch;patch=1 \
-	   file://no-introspect.patch;patch=1"
-
-inherit autotools pkgconfig gettext
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-
-do_configure_prepend() {
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
-	install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
-}
-
-do_stage () {
-	oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-}
-
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
diff --git a/packages/dbus/dbus-glib_0.72.bb b/packages/dbus/dbus-glib_0.74.bb
index 641f0263a2..3754abb708 100644
--- a/packages/dbus/dbus-glib_0.72.bb
+++ b/packages/dbus/dbus-glib_0.74.bb
@@ -6,7 +6,6 @@ LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
 	   file://no-examples.patch;patch=1 \
 	   file://no-introspect.patch;patch=1"
 
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index b329e82fa3..93eac00ccd 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -2,13 +2,15 @@ SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 LICENSE = "GPL"
-DEPENDS = "expat virtual/libintl"
+DEPENDS = "expat glib-2.0 virtual/libintl"
 
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
 	   file://tmpdir.patch;patch=1 \
 	   file://dbus-1.init \
-           file://cross.patch;patch=1 \
-	   file://fix-install-daemon.patch;patch=1"
+          "
 
 inherit autotools pkgconfig update-rc.d gettext
 
@@ -17,8 +19,8 @@ INITSCRIPT_PARAMS = "defaults"
 
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
 
-FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+FILES_${PN} = "${bindir}/dbus-daemon* ${bindir}/dbus-uuidgen ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 
 pkg_postinst_dbus() {
 #!/bin/sh
@@ -36,10 +38,11 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 }
 
-EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
+EXTRA_OECONF = "--disable-qt --disable-qt3  --disable-gtk --disable-tests \
 		--disable-checks --disable-xml-docs --disable-doxygen-docs \
 		--with-xml=expat --without-x"
 
+
 do_stage () {
 	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
 
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb
index 799509ab66..c2b31db782 100644
--- a/packages/dbus/dbus_1.0.2.bb
+++ b/packages/dbus/dbus_1.0.2.bb
@@ -1,5 +1,14 @@
 require dbus.inc
 
-SRC_URI += " file://fix-waitpid.patch;patch=1"
+DEFAULT_PREFERENCE = "1"
+
+PR = "r7"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+	   file://tmpdir.patch;patch=1 \
+	   file://dbus-1.init \
+	   file://cross.patch;patch=1 \
+	   file://fix-install-daemon.patch;patch=1"
+
+
 
-PR = "r4"
diff --git a/packages/ezx/ezxd_svn.bb b/packages/ezx/ezxd_svn.bb
index 56bc1c05bf..8b3390cea9 100644
--- a/packages/ezx/ezxd_svn.bb
+++ b/packages/ezx/ezxd_svn.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
 AUTHOR = "Daniel Ribeiro"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \
            file://ezxd.init \
@@ -21,8 +21,11 @@ do_configure() {
         sed -i -e s:CROSS:CC:g Makefile
 }
 
-do_install() {
-	install -d ${D}${bindir}
+fakeroot do_install() {
+        install -d ${D}/dev/input
+        mknod ${D}/dev/input/uinput c 10 223
+
+        install -d ${D}${bindir}
 	install -m 755 ezxd ${D}${bindir}
 
 	install -d ${D}${libdir}/ezxd
@@ -33,3 +36,5 @@ do_install() {
         install -m 0755 ${WORKDIR}/ezxd.init ${D}${sysconfdir}/init.d/ezxd
 }
 
+FILES_${PN} += "/dev"
+
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb
index 098939324a..cdfc28fb38 100644
--- a/packages/fontconfig/fontconfig_2.4.1.bb
+++ b/packages/fontconfig/fontconfig_2.4.1.bb
@@ -3,9 +3,9 @@ LICENSE = "BSD"
 DESCRIPTION = "A library for configuring and customizing font access."
 DEPENDS = "expat freetype freetype-native zlib"
 
-SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
-
-PR = "r0"
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+           https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h"
+PR = "r1"
 
 PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
 FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -39,6 +39,7 @@ python do_unpack () {
 }
 
 do_stage () {
+	cp ${WORKDIR}/device_symbols.h ${S}/fontconfig/
 	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/fontconfig
 	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
diff --git a/packages/gaim/pidgin_2.2.1.bb b/packages/gaim/pidgin_2.2.1.bb
new file mode 100644
index 0000000000..5531880669
--- /dev/null
+++ b/packages/gaim/pidgin_2.2.1.bb
@@ -0,0 +1,10 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+           file://sanitize-configure.ac.patch;patch=1 \
+           file://gconf-no-errors.patch;patch=1 \
+	   file://pidgin.desktop-set-icon.patch;patch=1 \
+	   file://purple-OE-branding.patch;patch=1 \
+	  " 
+
+PR = "r0"
diff --git a/packages/gcc/gcc-cross-initial.inc b/packages/gcc/gcc-cross-initial.inc
index 49e1937b06..7c56afecef 100644
--- a/packages/gcc/gcc-cross-initial.inc
+++ b/packages/gcc/gcc-cross-initial.inc
@@ -4,7 +4,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 PACKAGES = ""
 
 # This is intended to be a -very- basic config
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
 		--with-newlib \
 		--disable-shared \
 		--disable-threads \
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index fc64753e2c..34e111ee45 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -4,7 +4,7 @@ require gcc-paths-cross.inc
 inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
-PR="r4"
+PR="r5"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index b61223b39c..21ca6656ec 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r10"
+PR = "r11"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 316d06753a..0f0ad3b98f 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r4"
+PR = "r5"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index d2dc240126..73fd86a720 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 59da2080e8..33544af026 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r7"
+PR = "r8"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 0d3e5de6f4..0328f45cfb 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index b9267f7973..1d801761d1 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r13"
+PR = "r14"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index e67d6c6b7a..3272876326 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r8"
+PR = "r9"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 003fd9e79e..34f083b111 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r6"
+PR = "r7"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc
index 0c90eeac16..0d7f323ea4 100644
--- a/packages/gcc/gcc3-build-cross.inc
+++ b/packages/gcc/gcc3-build-cross.inc
@@ -1,8 +1,7 @@
 USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
 
-EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
-		      --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
-                      --disable-multilib"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR}/${TARGET_SYS} \
+		      --with-gxx-include-dir=${STAGING_DIR}/${TARGET_SYS}/include/c++"
 
 do_configure_prepend () {
 	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb
index ae3f0d2b41..5b78d57dc4 100644
--- a/packages/glibc/eglibc-initial_svn.bb
+++ b/packages/glibc/eglibc-initial_svn.bb
@@ -5,6 +5,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYNAMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -32,14 +33,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb
index 1fe67d46fe..7abac644bc 100644
--- a/packages/glibc/eglibc_svn.bb
+++ b/packages/glibc/eglibc_svn.bb
@@ -110,29 +110,6 @@ do_stage() {
         done
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-        rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-        oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-                   install-headers install-lib
-
-        install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-                   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-                   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-        install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-        install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-        install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-        for r in ${rpcsvc}; do
-                h=`echo $r|sed -e's,\.x$,.h,'`
-                install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-        done
-
-        for i in libc.a libc_pic.a libc_nonshared.a; do
-                install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-        done
-        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require eglibc-package.bbclass
diff --git a/packages/glibc/glibc-initial_2.2.5.bb b/packages/glibc/glibc-initial_2.2.5.bb
index 752164d968..151043369e 100644
--- a/packages/glibc/glibc-initial_2.2.5.bb
+++ b/packages/glibc/glibc-initial_2.2.5.bb
@@ -8,6 +8,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYANMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -33,14 +34,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
index 389c4616d6..aed639b930 100644
--- a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb
@@ -7,6 +7,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYANMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -32,14 +33,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-initial_2.3.2.bb b/packages/glibc/glibc-initial_2.3.2.bb
index 261f87b288..c7647f45ee 100644
--- a/packages/glibc/glibc-initial_2.3.2.bb
+++ b/packages/glibc/glibc-initial_2.3.2.bb
@@ -7,6 +7,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYNAMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -32,14 +33,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb
index b6bf3ece51..173d550f0a 100644
--- a/packages/glibc/glibc-initial_2.4.bb
+++ b/packages/glibc/glibc-initial_2.4.bb
@@ -1,3 +1,4 @@
+SECTION = "libs"
 require glibc_${PV}.bb
 
 DEPENDS = "linux-libc-headers"
@@ -5,6 +6,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYNAMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -30,14 +32,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h  ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-initial_2.5.bb b/packages/glibc/glibc-initial_2.5.bb
index 64f8d4a21e..f05c960bb5 100644
--- a/packages/glibc/glibc-initial_2.5.bb
+++ b/packages/glibc/glibc-initial_2.5.bb
@@ -5,6 +5,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYNAMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -31,14 +32,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-initial_2.6.1.bb b/packages/glibc/glibc-initial_2.6.1.bb
index 0d4a79f2a4..428a4a371e 100644
--- a/packages/glibc/glibc-initial_2.6.1.bb
+++ b/packages/glibc/glibc-initial_2.6.1.bb
@@ -5,6 +5,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYANMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -31,14 +32,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-initial_cvs.bb b/packages/glibc/glibc-initial_cvs.bb
index 1a3dfe84d1..47e2ef89a9 100644
--- a/packages/glibc/glibc-initial_cvs.bb
+++ b/packages/glibc/glibc-initial_cvs.bb
@@ -6,6 +6,7 @@ PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-cvs', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
+PACKAGES_DYNAMIC = ""
 
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
@@ -31,14 +32,14 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
 
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
+	touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
 }
 
 do_install () {
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 03ad02c5d6..fd79701e6b 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -190,40 +190,6 @@ do_stage() {
 		install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
 	done
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   '${CROSS_DIR}/${TARGET_SYS}/include/bits/errno.h' \
-		   '${CROSS_DIR}/${TARGET_SYS}/include/bits/libc-lock.h' \
-		   '${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/sys \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	install -m 0644 ${S}/include/bits/xopen_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 ${B}/gnu/lib-names.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${S}/include/limits.h ${CROSS_DIR}/${TARGET_SYS}/include/
-	install -m 0644 ${S}/include/gnu/libc-version.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${S}/include/gnu-versions.h ${CROSS_DIR}/${TARGET_SYS}/include/
-	install -m 0644 ${S}/include/values.h ${CROSS_DIR}/${TARGET_SYS}/include/
-	install -m 0644 ${S}/include/errno.h ${CROSS_DIR}/${TARGET_SYS}/include/
-	install -m 0644 ${S}/include/sys/errno.h ${CROSS_DIR}/${TARGET_SYS}/include/sys/
-	install -m 0644 ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 0a8ad92e37..df39c659c9 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -92,29 +92,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index 4a9edda5cf..6022210857 100644
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -178,29 +178,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 7f188d4c80..9fc4bcf738 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -114,29 +114,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index b4e06012fa..577e480a45 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -97,29 +97,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 843442d04a..79ecd145a6 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -98,29 +98,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 3f40281fae..5e43a07aee 100644
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -123,29 +123,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 644df24a5a..b06acd792d 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -2,7 +2,7 @@ require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r14"
+PR = "r15"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"
@@ -55,6 +55,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat
 
 # seems to fail on tls platforms
 SRC_URI_append_arm = " file://dyn-ldconfig-20041128.patch;patch=1"
+SRC_URI_append_armeb = " file://dyn-ldconfig-20041128.patch;patch=1"
 
 # Build fails on sh3 and sh4 without additional patches
 SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1 \
@@ -150,29 +151,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index b3962af5ef..6f408d70f8 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -166,29 +166,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index ff2b6535b0..e35e1ced43 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -176,29 +176,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 6d4587ee4c..7a73a03794 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -173,29 +173,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index 266e5e0d89..5ce25ae04f 100644
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -121,29 +121,6 @@ do_stage() {
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
-
-	rm -f ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6
-	oe_runmake 'install_root=${CROSS_DIR}/${TARGET_SYS}' \
-		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
-		   install-headers install-lib
-
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
-		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/
-	install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h
-	for r in ${rpcsvc}; do
-		h=`echo $r|sed -e's,\.x$,.h,'`
-		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/
-	done
-
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
-	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so
 }
 
 require glibc-package.bbclass
diff --git a/packages/gnome/gail_1.20.0.bb b/packages/gnome/gail_1.20.0.bb
new file mode 100644
index 0000000000..58168a04d5
--- /dev/null
+++ b/packages/gnome/gail_1.20.0.bb
@@ -0,0 +1,18 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+PR = "r0"
+DESCRIPTION = "GNOME Accessibility Implementation Library"
+DEPENDS = "gtk+"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
+
+do_stage() {
+	gnome_stage_includes
+	oe_libinstall -C gail -so libgail ${STAGING_LIBDIR}
+	oe_libinstall -C libgail-util -so libgailutil ${STAGING_LIBDIR}
+}
diff --git a/packages/gtk-webcore/midori/.mtn2git_empty b/packages/gnome/gnome-common-2.20.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gtk-webcore/midori/.mtn2git_empty
+++ b/packages/gnome/gnome-common-2.20.0/.mtn2git_empty
diff --git a/packages/gnome/gnome-common-2.20.0/omf.patch b/packages/gnome/gnome-common-2.20.0/omf.patch
new file mode 100644
index 0000000000..0d85b001e0
--- /dev/null
+++ b/packages/gnome/gnome-common-2.20.0/omf.patch
@@ -0,0 +1,13 @@
+--- gnome-common-2.4.0/doc-build/omf.make	2003-05-24 08:16:25.000000000 -0700
++++ gnome-common-2.4.0.new/doc-build/omf.make	2004-11-15 14:01:12.185155192 -0700
+@@ -43,7 +43,9 @@
+ install-data-hook-omf:
+ 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ 	for file in $(omffile); do \
+-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		if [ -f $$file.out ]; then \
++			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++		fi; \
+ 	done
+ 	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
diff --git a/packages/gnome/gnome-common_2.20.0.bb b/packages/gnome/gnome-common_2.20.0.bb
new file mode 100644
index 0000000000..2991db81c7
--- /dev/null
+++ b/packages/gnome/gnome-common_2.20.0.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r0"
+DESCRIPTION = "Common macros for building GNOME applications"
+inherit gnome
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
+
+do_stage () {
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	make DESTDIR="${STAGE_TEMP}" install
+	cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+	install -d ${STAGING_DATADIR}/gnome-common
+	install -d ${STAGING_DATADIR}/aclocal
+	cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+	cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+	rm -rf ${STAGE_TEMP}
+}
diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb
new file mode 100644
index 0000000000..f190a5ae13
--- /dev/null
+++ b/packages/gnome/gnome-doc-utils_0.12.0.bb
@@ -0,0 +1,16 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "libxml2 libxslt"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+FILES_${PN} += "${datadir}/xml*"
+
+do_stage() {
+	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
+	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
+	autotools_stage_all
+}
diff --git a/packages/mono/mono-1.2.5/.mtn2git_empty b/packages/gnome/gnome-keyring/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mono/mono-1.2.5/.mtn2git_empty
+++ b/packages/gnome/gnome-keyring/.mtn2git_empty
diff --git a/packages/gnome/gnome-keyring/org.gnome.keyring.service b/packages/gnome/gnome-keyring/org.gnome.keyring.service
new file mode 100644
index 0000000000..96ea061cfb
--- /dev/null
+++ b/packages/gnome/gnome-keyring/org.gnome.keyring.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.keyring
+Exec=/usr/bin/gnome-keyring-daemon
diff --git a/packages/gnome/gnome-keyring_0.8.1.bb b/packages/gnome/gnome-keyring_0.8.1.bb
new file mode 100644
index 0000000000..6489cbee21
--- /dev/null
+++ b/packages/gnome/gnome-keyring_0.8.1.bb
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+inherit autotools gnome pkgconfig
+
+DEPENDS = "gtk+"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/gnome/gnome-keyring_2.20.0.bb b/packages/gnome/gnome-keyring_2.20.0.bb
new file mode 100644
index 0000000000..2f72c5dfb1
--- /dev/null
+++ b/packages/gnome/gnome-keyring_2.20.0.bb
@@ -0,0 +1,23 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+PR = "r2"
+
+inherit autotools gnome pkgconfig
+
+DEPENDS = "gtk+ libgcrypt"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+SRC_URI += "file://org.gnome.keyring.service"
+
+do_install_append () {
+	install -d ${D}${datadir}/dbus-1/services
+	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
+}
+
+FILES_${PN} += "${datadir}/dbus-1/services"
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/gnome/gnome-mime-data_2.18.0.bb b/packages/gnome/gnome-mime-data_2.18.0.bb
new file mode 100644
index 0000000000..a9797d2298
--- /dev/null
+++ b/packages/gnome/gnome-mime-data_2.18.0.bb
@@ -0,0 +1,7 @@
+LICENSE = "GPL"
+inherit gnome
+
+DEPENDS += "shared-mime-info intltool-native"
+RDEPENDS = "shared-mime-info"
+
+FILES_${PN}-dev += "${datadir}/pkgconfig/*.pc"
diff --git a/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty b/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.20.0/.mtn2git_empty
diff --git a/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch b/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch
new file mode 100644
index 0000000000..3dbc130ddc
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch
@@ -0,0 +1,11 @@
+--- gnome-vfs-2.6.0/configure.in~	2004-03-22 12:36:23.000000000 +0000
++++ gnome-vfs-2.6.0/configure.in	2004-06-07 16:04:34.000000000 +0100
+@@ -154,7 +154,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+ 
+ if test x"$GCONFTOOL" = xno; then
+-  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++  AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
+ 
+ AM_GCONF_SOURCE_2
diff --git a/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch b/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch
new file mode 100644
index 0000000000..e25ecdd66f
--- /dev/null
+++ b/packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch
@@ -0,0 +1,51 @@
+removes kerberos completely to avoid conflicts with installed kerberos
+--- configure.in.orig	2007-01-05 19:42:26.418541610 +0200
++++ configure.in	2007-01-05 19:42:56.604261797 +0200
+@@ -436,47 +436,6 @@
+ ])
+ AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
+ AC_SUBST(CDDA_LIBS)
+-
+-dnl GSSAPI
+-dnl Check for Kerberos installation
+-have_gssapi=no
+-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-					   
+-if test "x$KRB5_CONFIG" != "xnone"; then
+-   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+-   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-   
+-   saved_CPPFLAGS="$CPPFLAGS"
+-   saved_LIBS="$LIBS"
+-   LIBS="$LIBS $GSSAPI_LIBS"
+-   CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+-   # MIT and Heimdal put gssapi.h in different places
+-   AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
+-       AC_CHECK_FUNCS(gss_init_sec_context, [
+-           AC_MSG_NOTICE([GSSAPI authentication support enabled])
+-           AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
+-           AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
+-		 have_gssapi=yes
+-	 
+-       # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
+-       AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
+-          [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, 
+-             [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
+-		], [
+-		    #ifdef HAVE_GSSAPI_GSSAPI_H
+-		    #include <gssapi/gssapi.h>
+-		    #else	   
+-		    #include <gssapi.h>
+-		    #endif
+-		])
+-	  ])
+-     break
+-   ])
+-   LIBS="$saved_LIBS" 
+-   CPPFLAGS="$saved_CPPFLAGS" 
+-fi   
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPI_CFLAGS)
+ 	   
+ dnl ******************************
+ dnl http-method (neon checks)
diff --git a/packages/gnome/gnome-vfs_2.18.1.bb b/packages/gnome/gnome-vfs_2.18.1.bb
index 4ae7406a46..8a3e460119 100644
--- a/packages/gnome/gnome-vfs_2.18.1.bb
+++ b/packages/gnome/gnome-vfs_2.18.1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
 RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
 
-PR = "r0"
+PR = "r1"
 
 inherit gnome
 
@@ -20,7 +20,7 @@ EXTRA_OECONF = " \
                  --with-samba-includes=${STAGING_INCDIR} \
                "
 
-FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
 FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
 FILES_${PN}-doc += " ${datadir}/gtk-doc"
 
diff --git a/packages/gnome/gnome-vfs_2.20.0.bb b/packages/gnome/gnome-vfs_2.20.0.bb
new file mode 100644
index 0000000000..5631a9c960
--- /dev/null
+++ b/packages/gnome/gnome-vfs_2.20.0.bb
@@ -0,0 +1,42 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
+RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
+# Some legacy packages will require gnome-mime-data to be installed, but use of
+# it is deprecated.
+PR = "r0"
+
+inherit gnome
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+RREPLACES = "gnome-vfs-dbus"
+
+EXTRA_OECONF = " \
+                 --disable-openssl \
+                 --enable-gnutls \
+                 --enable-avahi \
+                 --with-samba-includes=${STAGING_INCDIR} \
+               "
+
+FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
+FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+do_stage () {
+autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+	print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
+
+
diff --git a/packages/gnome/libart-lgpl/Makefile.am.patch b/packages/gnome/libart-lgpl/Makefile.am.patch
index 749de32e2a..edeed0a6e5 100644
--- a/packages/gnome/libart-lgpl/Makefile.am.patch
+++ b/packages/gnome/libart-lgpl/Makefile.am.patch
@@ -1,13 +1,7 @@
 --- libart_lgpl-2.3.16/Makefile.am.old	2004-06-26 18:57:07.000000000 +0100
 +++ libart_lgpl-2.3.16/Makefile.am	2004-06-26 18:57:12.000000000 +0100
-@@ -5,8 +5,8 @@
- 
- BUILT_SOURCES = art_config.h
- 
--art_config.h:	gen_art_config
+@@ -5,2 +5,2 @@
+-art_config.h:	gen_art_config$(EXEEXT)
 -	./gen_art_config > art_config.h
-+#art_config.h:	gen_art_config
++#art_config.h:	gen_art_config$(EXEEXT)
 +#	./gen_art_config > art_config.h
- 
- EXTRA_DIST = 			\
- 	libart-config.in	\
diff --git a/packages/gnome/libart-lgpl_2.3.19.bb b/packages/gnome/libart-lgpl_2.3.19.bb
new file mode 100644
index 0000000000..a37b392593
--- /dev/null
+++ b/packages/gnome/libart-lgpl_2.3.19.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Library of functions for 2D graphics"
+SECTION = "x11/gnome"
+LICENSE = "LGPL"
+
+ART_CONFIG = "${HOST_ARCH}/art_config.h"
+
+# can't use gnome.oeclass due to _ in filename
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
+       file://${ART_CONFIG} \
+       file://Makefile.am.patch;patch=1"
+
+inherit autotools pkgconfig
+
+DEPENDS = ""
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += "${bindir}/libart2-config"
+
+S = "${WORKDIR}/libart_lgpl-${PV}"
+
+do_configure_prepend() {
+	cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
+}
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	autotools_stage_includes
+	oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
+}
diff --git a/packages/gnome/libgnomecanvas_2.14.0.bb b/packages/gnome/libgnomecanvas_2.14.0.bb
new file mode 100644
index 0000000000..df183bb674
--- /dev/null
+++ b/packages/gnome/libgnomecanvas_2.14.0.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "A powerful object-oriented display"
+
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gnome/libgnomecanvas_2.20.0.bb b/packages/gnome/libgnomecanvas_2.20.0.bb
new file mode 100644
index 0000000000..8e13c9562b
--- /dev/null
+++ b/packages/gnome/libgnomecanvas_2.20.0.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "A powerful object-oriented display"
+
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl gail"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb
index e829ad39ca..e642b83cc7 100644
--- a/packages/gnome/libsoup_2.2.100.bb
+++ b/packages/gnome/libsoup_2.2.100.bb
@@ -1,18 +1,19 @@
 DESCRIPTION = "An HTTP library implementation in C"
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
+
 DEPENDS = "glib-2.0 gnutls libxml2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
 
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
+
 do_stage() {
 	rm -f ${PKG_CONFIG_DIR}/libsoup*
 	autotools_stage_all
 	ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
 }
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir}/ ${libdir}/"
-FILES_${PN}-doc = "${datadir}/"
diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd
index 3c3f63a4df..d8323e202c 100644
--- a/packages/gsm/files/fic-gta01/gsmd
+++ b/packages/gsm/files/fic-gta01/gsmd
@@ -1,4 +1,4 @@
-##!/bin/sh
+#!/bin/sh
 #
 # gsmd  This shell script starts and stops gsmd.
 #
@@ -15,6 +15,7 @@ case "$1" in
     start)
         stty -F "$GSM_DEV" -crtscts
         [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+        stty -F "$GSM_DEV" -echo
         [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
         [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
         [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
@@ -29,23 +30,20 @@ case "$1" in
         fi
         ;;
     stop)
-        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
-
         echo -n "Stopping GSM daemon: "
         start-stop-daemon -K -x /usr/sbin/gsmd
         stty -F "$GSM_DEV" -crtscts
+        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
         echo "gsmd."
         ;;
     restart|force-reload)
         $0 stop
         $0 start
-        exit
         ;;
     *)
-        echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+        echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}"
         exit 1
         ;;
 esac
 
 exit 0
-
diff --git a/packages/gsm/files/lgsm_send_fix_return_value.patch b/packages/gsm/files/lgsm_send_fix_return_value.patch
new file mode 100644
index 0000000000..00ba3a4549
--- /dev/null
+++ b/packages/gsm/files/lgsm_send_fix_return_value.patch
@@ -0,0 +1,11 @@
+--- gsm/src/libgsmd/libgsmd.c.orig	2007-09-25 00:41:56.000000000 -0500
++++ gsm/src/libgsmd/libgsmd.c	2007-09-25 00:43:44.000000000 -0500
+@@ -210,7 +210,7 @@
+ 			pos += rc;
+ 		}
+ 	}
+-	return 0;
++	return (sizeof(*gmh) + gmh->len);
+ }
+ 
+ struct gsmd_msg_hdr *lgsm_gmh_fill(int type, int subtype, int payload_len)
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index c2b758ecf4..9aaad58ee6 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svnr${SRCREV}"
-PR = "r29"
+PR = "r31"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://024_sms-text-in-bracket.patch;patch=1;minrev=2957 \
@@ -16,6 +16,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://0003-Correctly-segment-incoming-usock-data-into-packets.patch;patch=1;minrev=2957 \
            file://0004-Handle-read-and-write-return-values.patch;patch=1;minrev=2957 \ 
            file://0005-Add-ask-ds-option-forSMS.patch;patch=1;minrev=2957 \ 
+           file://lgsm_send_fix_return_value.patch;patch=1 \
            file://gsmd \
            file://default"
 S = "${WORKDIR}/gsm"
diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
index fbf36b94b0..d3b9d6ac20 100644
--- a/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/packages/gstreamer/gst-meta-base_0.10.bb
@@ -1,8 +1,8 @@
 # Based on its sibling on Poky which is copyright (C) 2006,2007  OpenedHand LTD
 
 DESCRIPTION = "Gstreamer package groups"
-DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly"
-PR = "r5"
+DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
+PR = "r7"
 
 PACKAGES = "\
     gst-meta-base \
diff --git a/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch b/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch
new file mode 100644
index 0000000000..2def90f7e4
--- /dev/null
+++ b/packages/gtk+/files/directfb-pixbuf-deprecated-fix.patch
@@ -0,0 +1,34 @@
+--- gtk+-2.10.14/gdk/directfb/Makefile.am.orig	2007-07-16 15:46:15.000000000 -0400
++++ gtk+-2.10.14/gdk/directfb/Makefile.am	2007-09-24 15:12:14.000000000 -0400
+@@ -8,7 +8,6 @@
+ 	-I$(top_srcdir)			\
+ 	-I$(top_srcdir)/gdk		\
+ 	-I$(top_builddir)/gdk		\
+-	-DG_DISABLE_DEPRECATED		\
+ 	@GTK_DEBUG_FLAGS@		\
+ 	@GDK_DEP_CFLAGS@		
+ 
+--- gtk+-2.10.14/gdk/quartz/Makefile.am.orig	2007-07-16 15:46:18.000000000 -0400
++++ gtk+-2.10.14/gdk/quartz/Makefile.am	2007-09-24 15:12:28.000000000 -0400
+@@ -7,7 +7,6 @@
+ 	-I$(top_srcdir)/gdk		\
+ 	-I$(top_builddir)/gdk		\
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
+-	-DGDK_DISABLE_DEPRECATED	\
+ 	$(GTK_DEBUG_FLAGS) 		\
+ 	$(GDK_DEP_CFLAGS)		\
+ 	"-xobjective-c"
+
+diff -ur gtk+-2.10.9~org/gdk-pixbuf/pixops/Makefile.am gtk+-2.10.9/gdk-pixbuf/pixops/Makefile.am
+--- gtk+-2.10.9~org/gdk-pixbuf/pixops/Makefile.am   2007-03-18 00:02:40.000000000 -0400
++++ gtk+-2.10.9/gdk-pixbuf/pixops/Makefile.am   2007-03-18 10:25:06.000000000 -0400
+@@@ -3,8 +3,7 @@
+ INCLUDES = \
+ 	-I$(top_srcdir) -I$(top_builddir) 	\
+ 	$(GTK_DEBUG_FLAGS)			\
+-	$(GDK_PIXBUF_DEP_CFLAGS)		\
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED
++	$(GDK_PIXBUF_DEP_CFLAGS)		
+ 
+ noinst_PROGRAMS = timescale
+ 
diff --git a/packages/gtk+/gtk+-directfb_2.10.9.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb
index f8062f33f7..e77f24638d 100644
--- a/packages/gtk+/gtk+-directfb_2.10.9.bb
+++ b/packages/gtk+/gtk+-directfb_2.10.14.bb
@@ -1,14 +1,29 @@
 require gtk-2.10.inc
 
-PR = "r0"
+PR = "r2"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
 S = "${WORKDIR}/gtk+-${PV}"
 
+
+RCONFLICTS = "gtk+"
+RPROVIDES ="gtk+-directfb"
+DEPENDS = "glib-2.0 pango-directfb atk jpeg libpng gtk-doc libgcrypt cairo-directfb cups"
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
+#NEATSTUFF = " ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif "
+
+#PACKAGES_DYNAMIC_${PN} = " ${NEATSTUFF} "
+#PACKAGES_DYNAMIC_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 "
+#PACKAGES_DYNAMIC_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1"
+RRECOMMENDS_${PN} = " "
+RRECOMMENDS_${PN}_linux = " "
+RRECOMMENDS_${PN}_linux-gnueabi = " "
+
+FILESPATH = "${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
+
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
            file://automake-lossage.patch;patch=1 \
@@ -25,7 +40,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://single-click.patch;patch=1 \
            file://spinbutton.patch;patch=1 \
            file://gtk+-handhelds.patch;patch=1 \
-	   file://directfb_pixbuf_deprecated_fix.patch;patch=1 \
+	   file://directfb-pixbuf-deprecated-fix.patch;patch=1 \
 #	   file://gtk-doc.patch;patch=1 \
 "
 EXTRA_OECONF =" \
diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index 463243554c..3fa5d22a71 100644
--- a/packages/gtk+/gtk-2.10.inc
+++ b/packages/gtk+/gtk-2.10.inc
@@ -14,6 +14,7 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${libdir}/lib*.so.* \
 	${datadir}/themes ${sysconfdir} \
 	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \
+"
 FILES_${PN}-dev += " \
         ${datadir}/gtk-2.0/include \
         ${libdir}/gtk-2.0/include \
@@ -51,7 +52,8 @@ do_stage () {
 
 	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
 	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
-
+        # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
+	cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/
 	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/gtk-webcore/midori/midori.desktop b/packages/gtk-webcore/midori/midori.desktop
deleted file mode 100644
index 683b1a343e..0000000000
--- a/packages/gtk-webcore/midori/midori.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Midori
-Comment=Webkit based browser
-Exec=midori
-Terminal=false
-Type=Application
-Categories=Application
diff --git a/packages/gtk-webcore/midori_0.0.6.bb b/packages/gtk-webcore/midori_0.0.6.bb
deleted file mode 100644
index ed0213964f..0000000000
--- a/packages/gtk-webcore/midori_0.0.6.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Midori is a lightweight web browser."
-LICENSE = "GPLv2"
-
-DEPENDS = "webkit-gtk libsexy" 
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
-           file://midori.desktop"
-
-do_install_append() {
-        if  [ -f ${WORKDIR}/midori.desktop ]; then
-                install -d ${D}${datadir}/applications
-                install -m 0644 ${WORKDIR}/midori.desktop ${D}${datadir}/applications
-        fi
-
-}
-
diff --git a/packages/gtk-webcore/midori_0.0.8.bb b/packages/gtk-webcore/midori_0.0.8.bb
new file mode 100644
index 0000000000..23d0179375
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.8.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+          "
+
+
diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb
index a504be42fa..c75db61a9a 100644
--- a/packages/gtk-webcore/osb-jscore_svn.bb
+++ b/packages/gtk-webcore/osb-jscore_svn.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.5.2+svnr${SRCREV}"
+PV = "0.5.2+svnr${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \
diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb
index 2cab1101ca..d982c6b595 100644
--- a/packages/gtk-webcore/osb-nrcit_svn.bb
+++ b/packages/gtk-webcore/osb-nrcit_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "nokia"
 PRIORITY = "optional"
 SECTION = "gpe"
 
-PV = "0.5.2+svnr${SRCREV}"
+PV = "0.5.2+svnr${SRCDATE}"
 PR = "r0"
 
 DEPENDS = "curl librsvg osb-nrcore pango"
diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb
index 402638d28e..5ca22d3083 100644
--- a/packages/gtk-webcore/osb-nrcore_svn.bb
+++ b/packages/gtk-webcore/osb-nrcore_svn.bb
@@ -2,7 +2,7 @@ require osb-nrcore.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.5.2+svnr${SRCREV}"
+PV = "0.5.2+svnr${SRCDATE}"
 PR = "r1"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
diff --git a/packages/guichan/files/.mtn2git_empty b/packages/guichan/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/guichan/files/.mtn2git_empty
diff --git a/packages/guichan/files/link-against-sdlimage.patch b/packages/guichan/files/link-against-sdlimage.patch
new file mode 100644
index 0000000000..e2e3ddb2e6
--- /dev/null
+++ b/packages/guichan/files/link-against-sdlimage.patch
@@ -0,0 +1,22 @@
+Index: guichan-0.6.1/configure.in
+===================================================================
+--- guichan-0.6.1.orig/configure.in	2007-09-28 18:35:17.000000000 +0200
++++ guichan-0.6.1/configure.in	2007-09-28 18:36:10.000000000 +0200
+@@ -116,6 +116,7 @@
+   SDLIMAGE="yes"
+   SDL_LIBS="$SDL_LIBS -lSDL_image"
+   CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
++  AC_SUBST([SDL_LIBS])
+ }
+ 
+ ForceSDLImage()
+Index: guichan-0.6.1/src/sdl/Makefile.am
+===================================================================
+--- guichan-0.6.1.orig/src/sdl/Makefile.am	2007-09-28 18:35:23.000000000 +0200
++++ guichan-0.6.1/src/sdl/Makefile.am	2007-09-28 18:35:51.000000000 +0200
+@@ -10,3 +10,5 @@
+ 	sdlimage.cpp		\
+ 	sdlimageloader.cpp	\
+ 	sdlinput.cpp
++
++libguichan_sdl_la_LDFLAGS = @SDL_LIBS@
diff --git a/packages/guichan/guichan_0.7.1.bb b/packages/guichan/guichan_0.7.1.bb
index 28c5c8e948..83a9eca2c5 100644
--- a/packages/guichan/guichan_0.7.1.bb
+++ b/packages/guichan/guichan_0.7.1.bb
@@ -1,8 +1,10 @@
 DESCRIPTION = "A portable C++ GUI library designed for games using Allegro, HGE, OpenGL, OpenLayer and/or SDL."
 HOMEPAGE = "http://guichan.sourceforge.net"
 DEPENDS = "virtual/libsdl libsdl-image"
+PR = "r1"
 
-SRC_URI = "http://guichan.googlecode.com/files/guichan-0.7.1.tar.gz"
+SRC_URI = "http://guichan.googlecode.com/files/${PN}-${PV}.tar.gz \
+           file://link-against-sdlimage.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/images/liveramdisk-image.bb b/packages/images/liveramdisk-image.bb
index 026ed7b81c..b3c288ec31 100644
--- a/packages/images/liveramdisk-image.bb
+++ b/packages/images/liveramdisk-image.bb
@@ -1,7 +1,6 @@
 # LiveRamdisk image
-# Hwo to build:
-# First build angstrom-x11-image with glibc
-# then switch to ANGSTROM_MODE=uclibc and build this recipe
+# Building with ANGSTROM_MODE=uclibc is recommended
+#
 # LiveRamdisk concept/implementation by Paul Sokolovsky
 LICENSE = "MIT"
 IMAGE_FSTYPES = "cpio.gz"
@@ -16,13 +15,3 @@ export IMAGE_LINGUAS = ""
 PACKAGE_INSTALL_NO_DEPS = "1"
 
 inherit image
-
-IMAGE_PREPROCESS_COMMAND += " copy_jffs2_image; "
-
-copy_jffs2_image() {
-	# We need glibc main image
-	latest_image=`ls -1 -r ${DEPLOY_DIR}/../glibc/images/${MACHINE}/Angstrom-x11-image-glibc-*.rootfs.jffs2|head -n1`
-	[ -n "$latest_image" ] || oefatal "Cannot find jffs2 image in ${DEPLOY_DIR}/../glibc/images/${MACHINE}/"
-	oenote "Using: cp $latest_image ${IMAGE_ROOTFS}/initrd.jffs2"
-	cp $latest_image ${IMAGE_ROOTFS}/initrd.jffs2
-}
diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index f3b8a0cd45..5c1e5c6ebb 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -60,9 +60,9 @@ do
 			
 		test "$pass" = 0 -o "$pass" = "" && rootcheck=no
 		
-		# Enable fsck for ext2 and ext3 rootfs, disable for everything else				
+		# Allow fsck for ext2 and ext3 rootfs, disable for everything else				
 		case "$type" in
-		ext2|ext3)	rootcheck=yes;;
+		ext2|ext3)	;;
 		*)		rootcheck=no;;
 		esac
 		
@@ -140,7 +140,7 @@ else
     esac
     test `uname -m` = s390 && spinner="" # This should go away
     test "$VERBOSE" != no && echo "Checking root filesystem..."
-    fsck $spinner $force $fix /
+    fsck $spinner $force $fix / </dev/null
     RTC=$?
     #
     # If there was a failure, drop into single-user mode.
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 06a12c04a5..bcc3aa2c35 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r100"
+PR = "r102"
 
 SRC_URI = "file://functions \
            file://halt \
diff --git a/packages/ipkg/files/lonk-link-name.patch b/packages/ipkg/files/lonk-link-name.patch
new file mode 100644
index 0000000000..14fc73a5ac
--- /dev/null
+++ b/packages/ipkg/files/lonk-link-name.patch
@@ -0,0 +1,38 @@
+--- ipkg-0.99.163/libbb/unarchive.c.orig	2007-10-04 12:39:42.000000000 +0200
++++ ipkg-0.99.163/libbb/unarchive.c	2007-10-04 12:41:28.000000000 +0200
+@@ -595,10 +595,6 @@
+         if (longname) {
+                 tar_entry->name = longname;
+                 longname = NULL;
+-        }
+-        else if (linkname) {
+-                tar_entry->name = linkname;
+-                linkname = NULL;
+         } else
+ #endif
+         if (tar.formated.prefix[0] == 0) {
+@@ -606,6 +602,15 @@
+         } else {                                              
+                 tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
+         }
++        
++#ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
++	if (linkname) {
++                tar_entry->link_name = linkname;
++                linkname = NULL;
++        } else
++#endif
++	tar_entry->link_name  = strlen(tar.formated.linkname) ? 
++	    xstrdup(tar.formated.linkname) : NULL;
+ 
+ 	// tar_entry->name = xstrdup(tar.formated.name);
+ 
+@@ -618,8 +623,6 @@
+ 	tar_entry->gid   = strtol(tar.formated.gid, NULL, 8);
+ 	tar_entry->size  = strtol(tar.formated.size, NULL, 8);
+ 	tar_entry->mtime = strtol(tar.formated.mtime, NULL, 8);
+-	tar_entry->link_name  = strlen(tar.formated.linkname) ? 
+-	    xstrdup(tar.formated.linkname) : NULL;
+ 	tar_entry->device = (strtol(tar.formated.devmajor, NULL, 8) << 8) +
+ 		strtol(tar.formated.devminor, NULL, 8);
+ 
diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb
index c5972a7c53..56e25900c1 100644
--- a/packages/ipkg/ipkg_0.99.163.bb
+++ b/packages/ipkg/ipkg_0.99.163.bb
@@ -1,5 +1,5 @@
 include ipkg.inc
-PR = "r4"
+PR = "r5"
 
 S = "${WORKDIR}/ipkg-${PV}"
 
@@ -8,6 +8,7 @@ SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
 	file://is-processing.patch;patch=1 \
 	file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \
 	file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \
+	file://lonk-link-name.patch;patch=1 \
 	"
 
 do_stage() {
diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc
index 7162231ec5..8c8519f230 100644
--- a/packages/iproute2/iproute2.inc
+++ b/packages/iproute2/iproute2.inc
@@ -7,7 +7,7 @@ DEPENDS = "flex-native bison-native"
 # Set the DATE in the .bb file
 SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
 
-# Set S in the .bb files
+S = "${WORKDIR}/iproute2-${PV}-${DATE}"
 
 inherit update-alternatives
 
diff --git a/packages/iproute2/iproute2_2.6.18.bb b/packages/iproute2/iproute2_2.6.18.bb
index ed5f3a11c6..d442a091db 100644
--- a/packages/iproute2/iproute2_2.6.18.bb
+++ b/packages/iproute2/iproute2_2.6.18.bb
@@ -1,10 +1,8 @@
-PR = "r2"
+PR = "r3"
 
-DATE = "061002"
-
-SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
-                   file://new-flex-fix.patch;patch=1"
+require iproute2.inc
 
-S = "${WORKDIR}/iproute2-${PV}-${DATE}"
+SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
+            file://new-flex-fix.patch;patch=1"
 
-require iproute2.inc
+DATE = "061002"
diff --git a/packages/iproute2/iproute2_2.6.20.bb b/packages/iproute2/iproute2_2.6.20.bb
index 9894bf0567..e72dfccdde 100644
--- a/packages/iproute2/iproute2_2.6.20.bb
+++ b/packages/iproute2/iproute2_2.6.20.bb
@@ -1,5 +1,6 @@
-PR = "r2"
+require iproute2.inc
 
+PR = "r2"
 DATE = "070313"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
@@ -9,4 +10,3 @@ SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
 
 S = "${WORKDIR}/iproute-${PV}-${DATE}"
 
-require iproute2.inc
diff --git a/packages/iproute2/iproute2_2.6.22.bb b/packages/iproute2/iproute2_2.6.22.bb
index f7347395f6..1ee0ce7ab2 100644
--- a/packages/iproute2/iproute2_2.6.22.bb
+++ b/packages/iproute2/iproute2_2.6.22.bb
@@ -1,5 +1,6 @@
-PR = "r1"
+require iproute2.inc
 
+PR = "r1"
 DATE = "070710"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
@@ -8,4 +9,3 @@ SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
 
 S = "${WORKDIR}"
 
-require iproute2.inc
diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.4/.mtn2git_empty b/packages/ixp4xx/ixp4xx-npe-native-2.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-npe-native-2.4/.mtn2git_empty
diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.4/IxNpeMicrocode.h b/packages/ixp4xx/ixp4xx-npe-native-2.4/IxNpeMicrocode.h
new file mode 100644
index 0000000000..5cbb4b473c
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-npe-native-2.4/IxNpeMicrocode.h
@@ -0,0 +1,143 @@
+/*
+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
+ *
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@innominate.com>
+ *
+ * This file is released under the GPLv2
+ *
+ *
+ * compile with
+ *
+ * gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+ *
+ * Executing the resulting binary on your build-host creates the
+ * "NPE-[ABC].xxxxxxxx" files containing the selected microcode
+ *
+ * fetch the IxNpeMicrocode.c from the Intel Access Library.
+ * It will include this header.
+ *
+ * select Images for every NPE from the following
+ * (used C++ comments for easy uncommenting ....)
+ */
+
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_TSLOT_SWITCH
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_2_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEA_ATM_MPHY_12_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_MPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_SPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0
+// #define IX_NPEDL_NPEIMAGE_NPEA_WEP
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+#define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL
+#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
+
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <endian.h>
+#include <byteswap.h>
+#include <string.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define to_le32(x) (x)
+#define to_be32(x) bswap_32(x)
+#else
+#define to_be32(x) (x)
+#define to_le32(x) bswap_32(x)
+#endif
+
+struct dl_image {
+	unsigned magic;
+	unsigned id;
+	unsigned size;
+	unsigned data[0];
+};
+
+const unsigned IxNpeMicrocode_array[];
+
+int main(int argc, char *argv[])
+{
+	struct dl_image *image = (struct dl_image *)IxNpeMicrocode_array;
+	int imgsiz, i, fd, cnt;
+	const unsigned *arrayptr = IxNpeMicrocode_array;
+	const char *names[] = { "IXP425", "IXP465", "unknown" };
+	int bigendian = 1;
+
+	if (argc > 1) {
+		if (!strcmp(argv[1], "-le"))
+			bigendian = 0;
+		else if (!strcmp(argv[1], "-be"))
+			bigendian = 1;
+		else {
+			printf("Usage: %s <-le|-be>\n", argv[0]);
+			return EXIT_FAILURE;
+		}
+	}
+
+	for (image = (struct dl_image *)arrayptr, cnt=0;
+		(image->id != 0xfeedf00d) && (image->magic == 0xfeedf00d);
+		image = (struct dl_image *)(arrayptr), cnt++)
+	{
+		unsigned char field[4];
+		imgsiz = image->size + 3;
+		*(unsigned*)field = to_be32(image->id);
+		char filename[40], slnk[10];
+
+		sprintf(filename, "NPE-%c.%08x", (field[0] & 0xf) + 'A',
+			image->id);
+		sprintf(slnk, "NPE-%c", (field[0] & 0xf) + 'A');
+		printf("Writing image: %s.NPE_%c Func: %2x Rev: %02x.%02x "
+			"Size: %5d to: '%s'\n",
+			names[field[0] >> 4], (field[0] & 0xf) + 'A',
+			field[1], field[2], field[3], imgsiz*4, filename);
+		fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
+		if (fd >= 0) {
+			for (i=0; i<imgsiz; i++) {
+				*(unsigned*)field = bigendian ?
+					to_be32(arrayptr[i]) :
+					to_le32(arrayptr[i]);
+				write(fd, field, sizeof(field));
+			}
+			close(fd);
+			unlink(slnk);
+			symlink(filename, slnk);
+		} else {
+			perror(filename);
+		}
+		arrayptr += imgsiz;
+	}
+	close(fd);
+	return 0;
+}
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.4.bb b/packages/ixp4xx/ixp4xx-npe-native_2.4.bb
new file mode 100644
index 0000000000..2b3da60b5d
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.4.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
+LICENSE = "Intel Software License Agreement"
+PR = "r0"
+
+SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip"
+SRC_URI += "file://IxNpeMicrocode.h"
+inherit native
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
+
+do_compile() {
+	mv ${WORKDIR}/IxNpeMicrocode.h ${S}/
+	gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+}
+
+do_stage() {
+	mv ${S}/IxNpeMicrocode ${S}/IxNpeMicrocode-${PV}
+	install -d ${STAGING_BINDIR}/
+	install -m 0755 ${S}/IxNpeMicrocode-${PV} ${STAGING_BINDIR}/
+}
diff --git a/packages/ixp4xx/ixp4xx-npe_2.4.bb b/packages/ixp4xx/ixp4xx-npe_2.4.bb
new file mode 100644
index 0000000000..71dc71e274
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-npe_2.4.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
+LICENSE = "Intel Software Licence Agreement"
+PR = "r0"
+DEPENDS = "ixp4xx-npe-native"
+
+# You need to download the IPL_ixp400NpeLibrary-2_4.zip file (without crypto) from:
+# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm
+# "Intel IXP400 software - NPE microcode (non-crypto)" -> "2.4"
+# and put it in your downloads directory so bitbake will find it.
+# Make sure you *read* and accept the license - it is not a standard one.
+
+SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip"
+S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
+
+COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
+
+FILES_${PN} = "${base_libdir}/firmware/NPE-B ${base_libdir}/firmware/NPE-C"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
+}
+
+do_install() {
+	install -d ${D}/${base_libdir}/firmware/
+	rm ${S}/NPE-B
+	mv ${S}/NPE-B.* ${S}/NPE-B
+	install ${S}/NPE-B ${D}/${base_libdir}/firmware/
+	rm ${S}/NPE-C
+	mv ${S}/NPE-C.* ${S}/NPE-C
+	install ${S}/NPE-C ${D}/${base_libdir}/firmware/
+}
+
+do_populate_staging() {
+	install -d ${STAGING_FIRMWARE_DIR}
+	install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+	install ${S}/NPE-C ${STAGING_FIRMWARE_DIR}/
+}
+
diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb
index 3cca30a6bb..74205da673 100644
--- a/packages/libgcrypt/libgcrypt_1.2.3.bb
+++ b/packages/libgcrypt/libgcrypt_1.2.3.bb
@@ -3,6 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL LGPL FDL"
 DEPENDS = "libgpg-error"
+PR = "r1"
 
 # move libgcrypt-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"
@@ -17,14 +18,5 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 ARM_INSTRUCTION_SET = "arm"
 
 do_stage() {
-	oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
-	oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
-	install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
-
-	install -d ${STAGING_INCDIR}/
-	for X in gcrypt.h gcrypt-module.h
-	do
-		install -m 0644 src/${X} ${STAGING_INCDIR}/${X}
-	done
-
+	autotools_stage_all
 }
diff --git a/packages/linux-libc-headers/linux-libc-headers.inc b/packages/linux-libc-headers/linux-libc-headers.inc
index d9f4d687ee..43f0958863 100644
--- a/packages/linux-libc-headers/linux-libc-headers.inc
+++ b/packages/linux-libc-headers/linux-libc-headers.inc
@@ -1,3 +1,5 @@
 DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
 SECTION = "devel"
 LICENSE = "GPL"
+
+DEPENDS = "cross-linkage"
+\ No newline at end of file
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
index 4ef77a0453..3f5cc3a0b5 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.11.1.bb
@@ -48,11 +48,6 @@ do_stage () {
 	rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
 	cp -pfLR include/linux ${STAGING_INCDIR}/
 	cp -pfLR include/asm ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
 }
 
 do_install() {
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
index 898bb120ae..0dba90dc97 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.15.99.bb
@@ -61,13 +61,6 @@ do_stage () {
 	cp -pfLR include/linux ${STAGING_INCDIR}/
 	cp -pfLR include/asm ${STAGING_INCDIR}/
 	cp -pfLR include/asm-generic ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR include/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
 }
 
 do_install() {
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
index df427ce582..73e9b07d7f 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18+2.6.19-rc1.bb
@@ -46,13 +46,6 @@ do_stage () {
 	cp -pfLR ${S}${includedir}/linux ${STAGING_INCDIR}/
 	cp -pfLR ${S}${includedir}/asm-${ARCH} ${STAGING_INCDIR}/asm
 	cp -pfLR ${S}${includedir}/asm-generic ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR ${S}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR ${S}${includedir}/asm-${ARCH} ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	cp -pfLR ${S}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
 }
 
 do_stage_append_nylon () {
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index dc278dea14..f65bf1459e 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -1,7 +1,7 @@
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "unifdef-native"
+DEPENDS += "unifdef-native"
 PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
@@ -60,19 +60,12 @@ do_stage () {
 	cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
 	cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
 	cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR ${STAGE_TEMP}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR ${STAGE_TEMP}${includedir}/asm ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
 	# Add UTS_RELEASE to version.h. UTS_RELEASE was moved from version.h to 
 	# utsrelease.h in order to avoid recompiling a kernel every time a localversion
 	# changed. Since the our headers are static and we're not compiling an 
 	# actual kernel, re-adding UTS_RELEASE does't hurt, and it allows uclibc to 
 	# compile with kernel headers that work with EABI on ARM
-	echo '#define UTS_RELEASE "2.6.18"' >> ${CROSS_DIR}/${TARGET_SYS}/include/linux/version.h
+	echo '#define UTS_RELEASE "2.6.18"' >> ${STAGING_INCDIR}/linux/version.h
 }
 
 do_stage_append_nylon () {
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 8145a80f8d..0b6112884e 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -1,7 +1,7 @@
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "unifdef-native"
+DEPENDS += "unifdef-native"
 PR = "r7"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
@@ -63,11 +63,4 @@ do_stage () {
 	cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
 	cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
 	cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR ${STAGE_TEMP}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR ${STAGE_TEMP}${includedir}/asm ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
 }
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
index 97e5a223a2..43a5cb9ef1 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
@@ -1,7 +1,7 @@
 require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "unifdef-native"
+DEPENDS += "unifdef-native"
 PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
@@ -63,11 +63,4 @@ do_stage () {
 	cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
 	cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
 	cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR ${STAGE_TEMP}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR ${STAGE_TEMP}${includedir}/asm ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/
 }
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
index b56900b9d6..932440b9d8 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.7.0.bb
@@ -43,12 +43,5 @@ do_stage () {
 	rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
 	cp -pfLR include/linux ${STAGING_INCDIR}/
 	cp -pfLR include/asm ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
-
 	ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h
-	ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${CROSS_DIR}/${TARGET_SYS}/include/linux/wireless.h
 }
diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
index 1f36aa2e92..3ca17ea9a3 100644
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.8.1.bb
@@ -51,9 +51,4 @@ do_stage () {
 	rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
 	cp -pfLR include/linux ${STAGING_INCDIR}/
 	cp -pfLR include/asm ${STAGING_INCDIR}/
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
-	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include
-	cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
 }
diff --git a/packages/linux/compulab-pxa270-2.6.22/defconfig b/packages/linux/compulab-pxa270-2.6.22/defconfig
index a6966d2dad..63bc69533f 100644
--- a/packages/linux/compulab-pxa270-2.6.22/defconfig
+++ b/packages/linux/compulab-pxa270-2.6.22/defconfig
@@ -220,7 +220,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data)"
+CONFIG_CMDLINE="console=ttyS1,38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb
index 963a8cf39f..86a7626d8a 100644
--- a/packages/linux/compulab-pxa270_2.6.22.bb
+++ b/packages/linux/compulab-pxa270_2.6.22.bb
@@ -3,7 +3,7 @@ require linux.inc
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	file://0001-cm-x270-base2.patch;patch=1 \
@@ -30,6 +30,8 @@ S = "${WORKDIR}/linux-${PV}"
 COMPATIBLE_HOST = 'arm.*-linux'
 COMPATIBLE_MACHINE = "compulab-pxa270"
 
+CMDLINE = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
+
 inherit kernel
 inherit package
 
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index 92bc34c987..af5f78b918 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -213,6 +213,7 @@ do_configure_prepend() {
 
 # Kernel module dependencies
 
+DEPENDS += "zd1211-firmware"
 RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
 
 
diff --git a/packages/linux/linux-2.6.21/gumstix-pxa270-mmc.patch b/packages/linux/linux-2.6.21/gumstix-pxa270-mmc.patch
new file mode 100644
index 0000000000..59d97809d1
--- /dev/null
+++ b/packages/linux/linux-2.6.21/gumstix-pxa270-mmc.patch
@@ -0,0 +1,33 @@
+Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
+===================================================================
+--- linux-2.6.21gum.orig/arch/arm/mach-pxa/gumstix.c
++++ linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
+@@ -33,8 +33,9 @@
+ 
+ static struct pxamci_platform_data gumstix_mci_platform_data;
+ 
+-static int gumstix_mci_init(struct device *dev, irqreturn_t (*gumstix_detect_int)(int, void *, struct pt_regs *), void *data)
++static int gumstix_mci_init(struct device *dev, irq_handler_t gumstix_detect_int, void *data)
+ {
++#ifndef CONFIG_ARCH_GUMSTIX_VERDEX 
+ 	int err;
+ 
+ 	pxa_gpio_mode(GPIO6_MMCCLK_MD);
+@@ -55,6 +56,17 @@ static int gumstix_mci_init(struct devic
+ 	}
+ 
+ 	err = set_irq_type(GUMSTIX_IRQ_GPIO_nSD_DETECT, IRQT_BOTHEDGE);
++#else
++	// Setup GPIOs for MMC on the 120-pin connector
++	// There is no card detect on a uSD connector so no interrupt to register
++	// There is no WP detect GPIO line either
++	pxa_gpio_mode(GPIO92_MMCDAT0_MD);
++	pxa_gpio_mode(GPIO112_MMCCMD_MD);
++	pxa_gpio_mode(GPIO110_MMCDAT2_MD);
++	pxa_gpio_mode(GPIO111_MMCDAT3_MD);
++	pxa_gpio_mode(GPIO109_MMCDAT1_MD);
++	pxa_gpio_mode(GPIO32_MMCCLK_MD);
++#endif
+ 
+ 	return 0;
+ }
diff --git a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig
index 9107cd0d7c..c6d5480089 100644
--- a/packages/linux/linux-2.6.21/gumstix-verdex/defconfig
+++ b/packages/linux/linux-2.6.21/gumstix-verdex/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21
-# Thu Sep 13 14:49:02 2007
+# Wed Oct  3 16:35:16 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -828,7 +828,8 @@ CONFIG_MII=m
 CONFIG_SMC91X=m
 CONFIG_SMC91X_GUMSTIX=m
 # CONFIG_DM9000 is not set
-# CONFIG_SMC911X is not set
+CONFIG_SMC911X=m
+CONFIG_SMC911X_GUMSTIX=m
 
 #
 # Ethernet (1000 Mbit)
diff --git a/packages/linux/linux-2.6.21/mmc-card-detect.patch b/packages/linux/linux-2.6.21/mmc-card-detect.patch
index 9a853b4df8..26dd970e3b 100644
--- a/packages/linux/linux-2.6.21/mmc-card-detect.patch
+++ b/packages/linux/linux-2.6.21/mmc-card-detect.patch
@@ -2,7 +2,7 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
 ===================================================================
 --- linux-2.6.21gum.orig/arch/arm/mach-pxa/gumstix.c
 +++ linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
-@@ -29,19 +29,51 @@
+@@ -29,19 +29,55 @@
  
  #include "generic.h"
  
@@ -38,9 +38,13 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
  
 +static int gumstix_mci_get_ro(struct device *dev)
 +{
++#ifdef CONFIG_ARCH_GUMSTIX_VERDEX
++	return 0;	// microSD is always writable on verdex
++#else
 +	int ro;
 +	ro = GPLR(GUMSTIX_GPIO_nSD_WP) & GPIO_bit(GUMSTIX_GPIO_nSD_WP);
 +	return ro;
++#endif
 +}
 +
 +static void gumstix_mci_exit(struct device *dev, void *data)
diff --git a/packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch b/packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch
index 3643b402e5..c9849d22f4 100644
--- a/packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch
+++ b/packages/linux/linux-2.6.21/pxafb-18bpp-mode.patch
@@ -154,7 +154,7 @@ Index: linux-2.6.21gum/drivers/video/pxafb.c
  				case '-':
  					namelen = i;
  					if (!bpp_specified && !yres_specified) {
-@@ -1227,6 +1268,18 @@ static int __init pxafb_parse_options(st
+@@ -1227,12 +1268,29 @@ static int __init pxafb_parse_options(st
  			}
  			if (bpp_specified)
  				switch (bpp) {
@@ -173,6 +173,17 @@ Index: linux-2.6.21gum/drivers/video/pxafb.c
  				case 1:
  				case 2:
  				case 4:
+ 				case 8:
+ 				case 16:
+ 					inf->modes[0].bpp = bpp;
++					if(nonstd_specified) {
++						dev_err(dev, "Depth %d requires nonstd to *not* be specified\n",bpp);
++					} else {
++						inf->modes[0].nonstd = 0;
++					}
+ 					dev_info(dev, "overriding bit depth: %d\n", bpp);
+ 					break;
+ 				default:
 Index: linux-2.6.21gum/include/asm-arm/arch-pxa/pxa-regs.h
 ===================================================================
 --- linux-2.6.21gum.orig/include/asm-arm/arch-pxa/pxa-regs.h
@@ -217,7 +228,7 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
 ===================================================================
 --- linux-2.6.21gum.orig/arch/arm/mach-pxa/gumstix.c
 +++ linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
-@@ -100,7 +100,8 @@ static struct pxafb_mode_info gumstix_fb
+@@ -116,7 +116,8 @@ static struct pxafb_mode_info gumstix_fb
  	.pixclock	= 110000,
  	.xres		= 480,
  	.yres		= 272,
@@ -227,7 +238,7 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
  	.hsync_len	= 41,
  	.left_margin	= 2,
  	.right_margin	= 2,
-@@ -139,7 +140,8 @@ static struct pxafb_mode_info gumstix_fb
+@@ -144,7 +145,8 @@ static struct pxafb_mode_info gumstix_fb
  	.vsync_len	= 10, // VLW from datasheet: 10 typ
  	.upper_margin	= 2, // VBP - VLW from datasheet: 12 - 10 = 2
  	.lower_margin	= 4, // VFP from datasheet: 4 typ
diff --git a/packages/linux/linux-2.6.21/pxafb-definition.patch b/packages/linux/linux-2.6.21/pxafb-definition.patch
index 2a782c6143..56369fd788 100644
--- a/packages/linux/linux-2.6.21/pxafb-definition.patch
+++ b/packages/linux/linux-2.6.21/pxafb-definition.patch
@@ -10,10 +10,26 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
  #include <asm/arch/gumstix.h>
  
  #include "generic.h"
-@@ -86,6 +87,95 @@ static struct platform_device gum_audio_
+@@ -86,6 +87,89 @@ static struct platform_device gum_audio_
  	.id		= -1,
  };
  
++
++#if defined(CONFIG_FB_PXA_SHARP_LQ043_PSP) || defined(CONFIG_FB_PXA_SAMSUNG_LTE430WQ_F0C)
++static void gumstix_lcd_backlight(int on_or_off)
++{
++	if(on_or_off)
++	{
++		pxa_gpio_mode(17 | GPIO_IN);
++	} else {
++		GPCR(17) = GPIO_bit(17);
++		pxa_gpio_mode(17 | GPIO_OUT);
++		GPCR(17) = GPIO_bit(17);
++	}
++}
++#endif
++
++
 +#ifdef CONFIG_FB_PXA_ALPS_CDOLLAR
 +static struct pxafb_mode_info gumstix_fb_mode = {
 +	.pixclock	= 300000,
@@ -50,17 +66,6 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
 +	.sync		= 0, // Hsync and Vsync both active low
 +};
 +
-+static void gumstix_lcd_backlight(int on_or_off)
-+{
-+	pxa_gpio_mode(17 | GPIO_OUT);
-+	if(on_or_off)
-+	{
-+		GPSR(17) = GPIO_bit(17);
-+	} else {
-+		GPCR(17) = GPIO_bit(17);
-+	}
-+}
-+
 +static struct pxafb_mach_info gumstix_fb_info = {
 +	.modes			= &gumstix_fb_mode,
 +	.num_modes		= 1,
@@ -83,17 +88,6 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
 +	.sync		= 0, // Hsync and Vsync both active low
 +};
 +
-+static void gumstix_lcd_backlight(int on_or_off)
-+{
-+	pxa_gpio_mode(17 | GPIO_OUT);
-+	if(on_or_off)
-+	{
-+		GPSR(17) = GPIO_bit(17);
-+	} else {
-+		GPCR(17) = GPIO_bit(17);
-+	}
-+}
-+
 +static struct pxafb_mach_info gumstix_fb_info = {
 +	.modes			= &gumstix_fb_mode,
 +	.num_modes		= 1,
@@ -106,7 +100,7 @@ Index: linux-2.6.21gum/arch/arm/mach-pxa/gumstix.c
  static struct platform_device *devices[] __initdata = {
  	&gum_audio_device,
  };
-@@ -94,6 +184,9 @@ static void __init gumstix_init(void)
+@@ -94,6 +178,9 @@ static void __init gumstix_init(void)
  {
  	pxa_set_mci_info(&gumstix_mci_platform_data);
  	pxa_set_udc_info(&gumstix_udc_info);
diff --git a/packages/linux/linux-2.6.21/smc911x-fixup.patch b/packages/linux/linux-2.6.21/smc911x-fixup.patch
new file mode 100644
index 0000000000..c0b7574d3a
--- /dev/null
+++ b/packages/linux/linux-2.6.21/smc911x-fixup.patch
@@ -0,0 +1,392 @@
+Index: linux-2.6.21gum/drivers/net/smc911x.c
+===================================================================
+--- linux-2.6.21gum.orig/drivers/net/smc911x.c
++++ linux-2.6.21gum/drivers/net/smc911x.c
+@@ -76,6 +76,7 @@ static const char version[] =
+ #include <linux/etherdevice.h>
+ #include <linux/skbuff.h>
+ 
++#include <linux/irq.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
+ 
+@@ -303,14 +304,14 @@ static void smc911x_reset(struct net_dev
+ 	SMC_SET_AFC_CFG(lp->afc_cfg);
+ 
+ 
+-	/* Set to LED outputs */
+-	SMC_SET_GPIO_CFG(0x70070000);
++	/* Set to LED outputs and configure EEPROM pins as GP outputs */
++	SMC_SET_GPIO_CFG(GPIO_CFG_LED1_EN_ | GPIO_CFG_LED2_EN_ | 1 << 20);
+ 
+ 	/*
+-	 * Deassert IRQ for 1*10us for edge type interrupts
++	 * Deassert IRQ for 22*10us for edge type interrupts
+ 	 * and drive IRQ pin push-pull
+ 	 */
+-	SMC_SET_IRQ_CFG( (1 << 24) | INT_CFG_IRQ_EN_ | INT_CFG_IRQ_TYPE_ );
++	SMC_SET_IRQ_CFG( (22 << 24) | INT_CFG_IRQ_EN_ | INT_CFG_IRQ_TYPE_ );
+ 
+ 	/* clear anything saved */
+ 	if (lp->pending_tx_skb != NULL) {
+@@ -413,7 +414,7 @@ static inline void smc911x_drop_pkt(stru
+ 	if (fifo_count <= 4) {
+ 		/* Manually dump the packet data */
+ 		while (fifo_count--)
+-			SMC_GET_RX_FIFO();
++			(void)SMC_GET_RX_FIFO();
+ 	} else	 {
+ 		/* Fast forward through the bad packet */
+ 		SMC_SET_RX_DP_CTRL(RX_DP_CTRL_FFWD_BUSY_);
+@@ -499,7 +500,7 @@ static inline void	 smc911x_rcv(struct n
+ 		SMC_SET_RX_CFG(RX_CFG_RX_END_ALGN4_ | ((2<<8) & RX_CFG_RXDOFF_));
+ 		SMC_PULL_DATA(data, pkt_len+2+3);
+ 
+-		DBG(SMC_DEBUG_PKTS, "%s: Received packet\n", dev->name,);
++		DBG(SMC_DEBUG_PKTS, "%s: Received packet\n", dev->name);
+ 		PRINT_PKT(data, ((pkt_len - 4) <= 64) ? pkt_len - 4 : 64);
+ 		dev->last_rx = jiffies;
+ 		skb->dev = dev;
+@@ -900,6 +901,7 @@ static void smc911x_phy_powerdown(struct
+ 	unsigned long ioaddr = dev->base_addr;
+ 	unsigned int bmcr;
+ 
++	DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
+ 	/* Enter Link Disable state */
+ 	SMC_GET_PHY_BMCR(phy, bmcr);
+ 	bmcr |= BMCR_PDOWN;
+@@ -925,6 +927,7 @@ static void smc911x_phy_check_media(stru
+ 
+ 	if (mii_check_media(&lp->mii, netif_msg_link(lp), init)) {
+ 		/* duplex state has changed */
++		DBG(SMC_DEBUG_MISC, "%s: duplex state has changed\n", dev->name);
+ 		SMC_GET_PHY_BMCR(phyaddr, bmcr);
+ 		SMC_GET_MAC_CR(cr);
+ 		if (lp->mii.full_duplex) {
+@@ -960,6 +963,7 @@ static void smc911x_phy_configure(struct
+ 	int my_phy_caps; /* My PHY capabilities */
+ 	int my_ad_caps; /* My Advertised capabilities */
+ 	int status;
++	int bmcr;
+ 	unsigned long flags;
+ 
+ 	DBG(SMC_DEBUG_FUNC, "%s: --> %s()\n", dev->name, __FUNCTION__);
+@@ -1033,9 +1037,12 @@ static void smc911x_phy_configure(struct
+ 
+ 	DBG(SMC_DEBUG_MISC, "%s: phy caps=0x%04x\n", dev->name, my_phy_caps);
+ 	DBG(SMC_DEBUG_MISC, "%s: phy advertised caps=0x%04x\n", dev->name, my_ad_caps);
++	DBG(SMC_DEBUG_MISC, "%s: phy advertised readback caps=0x%04x\n", dev->name, status);
+ 
+ 	/* Restart auto-negotiation process in order to advertise my caps */
+-	SMC_SET_PHY_BMCR(phyaddr, BMCR_ANENABLE | BMCR_ANRESTART);
++	SMC_GET_PHY_BMCR(phyaddr, bmcr);
++	bmcr |= BMCR_ANENABLE | BMCR_ANRESTART;
++	SMC_SET_PHY_BMCR(phyaddr, bmcr);
+ 
+ 	smc911x_phy_check_media(dev, 1);
+ 
+@@ -1888,6 +1895,39 @@ static int __init smc911x_findirq(unsign
+ 	return probe_irq_off(cookie);
+ }
+ 
++static inline unsigned int is_gumstix_oui(u8 *addr)
++{
++	return (addr[0] == 0x00 && addr[1] == 0x15 && addr[2] == 0xC9);
++}
++
++/**
++ * gen_serial_ether_addr - Generate software assigned Ethernet address
++ * based on the system_serial number
++ * @addr: Pointer to a six-byte array containing the Ethernet address
++ *
++ * Generate an Ethernet address (MAC) that is not multicast
++ * and has the local assigned bit set, keyed on the system_serial
++ */
++static inline void gen_serial_ether_addr(u8 *addr)
++{
++	static u8 ether_serial_digit = 0;
++	addr [0] = system_serial_high >> 8;
++	addr [1] = system_serial_high;
++	addr [2] = system_serial_low >> 24;
++	addr [3] = system_serial_low >> 16;
++	addr [4] = system_serial_low >> 8;
++	addr [5] = (system_serial_low & 0xc0) |	/* top bits are from system serial */
++		(1 << 4) |			/* 2 bits identify interface type 1=ether, 2=usb, 3&4 undef */
++		((ether_serial_digit++) & 0x0f);	/* 15 possible interfaces of each type */
++
++	if(!is_gumstix_oui(addr))
++	{
++		addr [0] &= 0xfe;		/* clear multicast bit */
++		addr [0] |= 0x02;		/* set local assignment bit (IEEE802) */
++	}
++}
++
++
+ /*
+  * Function: smc911x_probe(unsigned long ioaddr)
+  *
+@@ -2116,15 +2156,13 @@ static int __init smc911x_probe(struct n
+ #endif
+ 		printk("\n");
+ 		if (!is_valid_ether_addr(dev->dev_addr)) {
+-			printk("%s: Invalid ethernet MAC address. Please "
+-					"set using ifconfig\n", dev->name);
+-		} else {
+-			/* Print the Ethernet address */
+-			printk("%s: Ethernet addr: ", dev->name);
+-			for (i = 0; i < 5; i++)
+-				printk("%2.2x:", dev->dev_addr[i]);
+-			printk("%2.2x\n", dev->dev_addr[5]);
++			gen_serial_ether_addr(dev->dev_addr);
+ 		}
++		/* Print the Ethernet address */
++		printk("%s: Ethernet addr: ", dev->name);
++		for (i = 0; i < 5; i++)
++			printk("%2.2x:", dev->dev_addr[i]);
++		printk("%2.2x\n", dev->dev_addr[5]);
+ 
+ 		if (lp->phy_type == 0) {
+ 			PRINTK("%s: No PHY found\n", dev->name);
+@@ -2300,8 +2338,15 @@ static struct platform_driver smc911x_dr
+ 	},
+ };
+ 
++#ifdef CONFIG_ARCH_GUMSTIX
++extern void gumstix_smc911x_load(void);
++#endif
++
+ static int __init smc911x_init(void)
+ {
++#ifdef CONFIG_ARCH_GUMSTIX
++	gumstix_smc911x_load();
++#endif
+ 	return platform_driver_register(&smc911x_driver);
+ }
+ 
+Index: linux-2.6.21gum/drivers/net/gumstix-smc911x.c
+===================================================================
+--- /dev/null
++++ linux-2.6.21gum/drivers/net/gumstix-smc911x.c
+@@ -0,0 +1,148 @@
++/*
++ *  Gumstix SMC911x chip intialization driver
++ *
++ *  Author:     Craig Hughes
++ *  Created:    December 9, 2004
++ *  Copyright:  (C) 2004 Craig Hughes
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/ioport.h>
++#include <linux/device.h>
++#include <linux/platform_device.h>
++#include <linux/delay.h>
++
++#include <asm/hardware.h>
++#include <asm/arch/pxa-regs.h>
++#include <asm/delay.h>
++
++#include <asm/arch/gumstix.h>
++
++#define SMC_DEBUG               9
++#include <asm/io.h>
++#include "smc911x.h"
++
++static struct resource gumstix_smc911x0_resources[] = {
++	[0] = {
++		.name	= "smc911x-regs",
++		.start  = PXA_CS1_PHYS,
++		.end    = PXA_CS1_PHYS + 0x000fffff,
++		.flags  = IORESOURCE_MEM,
++	},
++	[1] = {
++		.start  = GUMSTIX_ETH0_IRQ,
++		.end    = GUMSTIX_ETH0_IRQ,
++		.flags  = IORESOURCE_IRQ,
++	},
++};
++
++static struct resource gumstix_smc911x1_resources[] = {
++	[0] = {
++		.name	= "smc911x-regs",
++		.start	= PXA_CS2_PHYS,
++		.end	= PXA_CS2_PHYS + 0x000fffff,
++		.flags	= IORESOURCE_MEM,
++	},
++	[1] = {
++		.start	= GUMSTIX_ETH1_IRQ,
++		.end	= GUMSTIX_ETH1_IRQ,
++		.flags	= IORESOURCE_IRQ,
++	},
++};
++
++static struct platform_device gumstix_smc911x0_device = {
++	.name           = "smc911x",
++	.id             = 0,
++	.num_resources  = ARRAY_SIZE(gumstix_smc911x0_resources),
++	.resource       = gumstix_smc911x0_resources,
++};
++
++static struct platform_device gumstix_smc911x1_device = {
++	.name           = "smc911x",
++	.id             = 1,
++	.num_resources  = ARRAY_SIZE(gumstix_smc911x1_resources),
++	.resource       = gumstix_smc911x1_resources,
++};
++
++static struct platform_device *smc911x_devices[] = {
++	&gumstix_smc911x0_device,
++	&gumstix_smc911x1_device,
++};
++
++/* First we're going to test if there's a 2nd SMC911x, and if not, then we'll free up those resources and the GPIO lines
++ * that it would otherwise use.  We have no choice but to probe by doing:
++ * Set nCS2 to CS2 mode
++ * Set the reset line to GPIO out mode, and pull it high, then drop it low (to trigger reset)
++ * Read from the memory space to check for the sentinel sequence identifying a likely SMC911x device
++ */
++int __init gumstix_smc911x_init(void)
++{
++	unsigned int val, num_devices=ARRAY_SIZE(smc911x_devices);
++	void *ioaddr;
++
++	/* Set up nPWE */
++	pxa_gpio_mode(GPIO49_nPWE_MD);
++
++	pxa_gpio_mode(GPIO78_nCS_2_MD);
++	// If either if statement fails, then we'll drop out and turn_off_eth1,
++	// if both succeed, then we'll skip that and just proceed with 2 cards
++	if(request_mem_region(gumstix_smc911x1_resources[1].start, SMC911X_IO_EXTENT, "smc911x probe"))
++	{
++		ioaddr = ioremap(gumstix_smc911x1_resources[1].start, SMC911X_IO_EXTENT);
++		val = SMC_GET_PN();
++		iounmap(ioaddr);
++		release_mem_region(gumstix_smc911x1_resources[1].start, SMC911X_IO_EXTENT);
++		if (CHIP_9115 == val ||
++			CHIP_9116 == val ||
++			CHIP_9117 == val ||
++			CHIP_9118 == val ) {
++			goto proceed;
++		}
++	}
++
++turn_off_eth1:
++	// This is apparently not an SMC911x
++	// So, let's decrement the number of devices to request, and reset the GPIO lines to GPIO IN mode
++	num_devices--;
++	smc911x_devices[1] = NULL;
++	pxa_gpio_mode(78 | GPIO_IN);
++	
++proceed:
++	pxa_gpio_mode(GPIO15_nCS_1_MD);
++
++	if(smc911x_devices[1]) pxa_gpio_mode(GPIO_GUMSTIX_ETH1_RST_MD);
++	pxa_gpio_mode(GPIO_GUMSTIX_ETH0_RST_MD);
++
++	if(smc911x_devices[1]) GPCR(GPIO_GUMSTIX_ETH1_RST) = GPIO_bit(GPIO_GUMSTIX_ETH1_RST);
++	GPCR(GPIO_GUMSTIX_ETH0_RST) = GPIO_bit(GPIO_GUMSTIX_ETH0_RST);
++	msleep(500); // Hold RESET for at least 200Âµ
++
++	if(smc911x_devices[1]) GPSR(GPIO_GUMSTIX_ETH1_RST) = GPIO_bit(GPIO_GUMSTIX_ETH1_RST);
++	GPSR(GPIO_GUMSTIX_ETH0_RST) = GPIO_bit(GPIO_GUMSTIX_ETH0_RST);
++	msleep(50);
++
++	return platform_add_devices(smc911x_devices, num_devices);
++}
++
++void __exit gumstix_smc911x_exit(void)
++{
++	if(smc911x_devices[1] != NULL) platform_device_unregister(&gumstix_smc911x1_device);
++	platform_device_unregister(&gumstix_smc911x0_device);
++}
++
++void gumstix_smc911x_load(void) {}
++EXPORT_SYMBOL(gumstix_smc911x_load);
++
++module_init(gumstix_smc911x_init);
++module_exit(gumstix_smc911x_exit);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Craig Hughes <craig@gumstix.com>");
++MODULE_DESCRIPTION("Gumstix board SMC911x chip initialization driver");
++MODULE_VERSION("1:0.1");
+Index: linux-2.6.21gum/drivers/net/Kconfig
+===================================================================
+--- linux-2.6.21gum.orig/drivers/net/Kconfig
++++ linux-2.6.21gum/drivers/net/Kconfig
+@@ -897,6 +897,13 @@ config SMC911X
+ 	  called smc911x.  If you want to compile it as a module, say M 
+ 	  here and read <file:Documentation/modules.txt>
+ 
++config SMC911X_GUMSTIX
++	tristate
++	default m if SMC911X=m
++	default y if SMC911X=y
++	depends on SMC911X && ARCH_GUMSTIX
++
++
+ config NET_VENDOR_RACAL
+ 	bool "Racal-Interlan (Micom) NI cards"
+ 	depends on NET_ETHERNET && ISA
+Index: linux-2.6.21gum/drivers/net/Makefile
+===================================================================
+--- linux-2.6.21gum.orig/drivers/net/Makefile
++++ linux-2.6.21gum/drivers/net/Makefile
+@@ -201,6 +201,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
+ obj-$(CONFIG_MACB) += macb.o
+ 
+ obj-$(CONFIG_SMC91X_GUMSTIX) += gumstix-smc91x.o
++obj-$(CONFIG_SMC911X_GUMSTIX) += gumstix-smc911x.o
+ obj-$(CONFIG_ARM) += arm/
+ obj-$(CONFIG_DEV_APPLETALK) += appletalk/
+ obj-$(CONFIG_TR) += tokenring/
+Index: linux-2.6.21gum/include/asm-arm/arch-pxa/gumstix.h
+===================================================================
+--- linux-2.6.21gum.orig/include/asm-arm/arch-pxa/gumstix.h
++++ linux-2.6.21gum/include/asm-arm/arch-pxa/gumstix.h
+@@ -52,7 +52,7 @@
+ #define GPIO_GUMSTIX_ETH0_RST		80
+ #define GPIO_GUMSTIX_ETH0		36
+ #else
+-#define GPIO_GUMSTIX_ETH0_RST		32
++#define GPIO_GUMSTIX_ETH0_RST		107
+ #define GPIO_GUMSTIX_ETH0		99
+ #endif
+ #define GPIO_GUMSTIX_ETH1_RST		52
+Index: linux-2.6.21gum/drivers/net/smc911x.h
+===================================================================
+--- linux-2.6.21gum.orig/drivers/net/smc911x.h
++++ linux-2.6.21gum/drivers/net/smc911x.h
+@@ -33,7 +33,9 @@
+  * Use the DMA feature on PXA chips
+  */
+ #ifdef CONFIG_ARCH_PXA
++#ifndef CONFIG_SMC911X_GUMSTIX
+   #define SMC_USE_PXA_DMA	1
++#endif
+   #define SMC_USE_16BIT		0
+   #define SMC_USE_32BIT		1
+ #endif
+@@ -46,13 +48,13 @@
+ #if	SMC_USE_16BIT
+ #define SMC_inb(a, r)			 readb((a) + (r))
+ #define SMC_inw(a, r)			 readw((a) + (r))
+-#define SMC_inl(a, r)			 ((SMC_inw(a, r) & 0xFFFF)+(SMC_inw(a+2, r)<<16))
++#define SMC_inl(a, r)			 ((SMC_inw(a, r) & 0xFFFF)+(SMC_inw((a)+2, r)<<16))
+ #define SMC_outb(v, a, r)		 writeb(v, (a) + (r))
+ #define SMC_outw(v, a, r)		 writew(v, (a) + (r))
+ #define SMC_outl(v, a, r) 			 \
+ 	do{					 \
+-		 writel(v & 0xFFFF, (a) + (r));	 \
+-		 writel(v >> 16, (a) + (r) + 2); \
++		 writel((v) & 0xFFFF, (a) + (r));	 \
++		 writel((v) >> 16, (a) + (r) + 2); \
+ 	 } while (0)
+ #define SMC_insl(a, r, p, l)	 readsw((short*)((a) + (r)), p, l*2)
+ #define SMC_outsl(a, r, p, l)	 writesw((short*)((a) + (r)), p, l*2)
diff --git a/packages/linux/linux-davinci/binutils-buildid-arm.patch b/packages/linux/linux-davinci/binutils-buildid-arm.patch
new file mode 100644
index 0000000000..edd224f4dd
--- /dev/null
+++ b/packages/linux/linux-davinci/binutils-buildid-arm.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
+index 5ff5406..538fcb5 100644
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -94,6 +94,7 @@ SECTIONS
+ 			TEXT_TEXT
+ 			SCHED_TEXT
+ 			LOCK_TEXT
++			*(.note.*)
+ #ifdef CONFIG_MMU
+ 			*(.fixup)
+ #endif
diff --git a/packages/linux/linux-davinci/davinci-dvevm/defconfig b/packages/linux/linux-davinci/davinci-dvevm/defconfig
index 02df8e79d9..e64431a1b6 100644
--- a/packages/linux/linux-davinci/davinci-dvevm/defconfig
+++ b/packages/linux/linux-davinci/davinci-dvevm/defconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-omap1
-# Sun Aug 12 17:15:12 2007
+# Linux kernel version: 2.6.23-rc2-davinci1
+# Fri Aug 17 20:43:45 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_TIME is not set
-# CONFIG_GENERIC_CLOCKEVENTS is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_MMU=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
@@ -26,26 +26,20 @@ CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
+# CONFIG_USER_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -67,34 +61,30 @@ CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_KMOD=y
-
-#
-# Block layer
-#
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
 
 #
 # IO Schedulers
@@ -126,14 +116,16 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -141,8 +133,17 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_OMAP is not set
 CONFIG_ARCH_DAVINCI=y
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_MACH_OMAP_APOLLON_PLUS is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
 
 #
 # TI DaVinci Implementations
@@ -172,6 +173,7 @@ CONFIG_CPU_32=y
 CONFIG_CPU_ARM926T=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y
 CONFIG_CPU_TLB_V4WBI=y
@@ -191,6 +193,7 @@ CONFIG_ARM_THUMB=y
 #
 # Bus support
 #
+# CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
@@ -202,11 +205,11 @@ CONFIG_ARM_THUMB=y
 # Kernel Features
 #
 # CONFIG_TICK_ONESHOT is not set
-CONFIG_PREEMPT=y
-# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+# CONFIG_PREEMPT is not set
 CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_AEABI is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
@@ -218,8 +221,9 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
 CONFIG_LEDS=y
-# CONFIG_LEDS_TIMER is not set
 # CONFIG_LEDS_CPU is not set
 CONFIG_ALIGNMENT_TRAP=y
 
@@ -239,8 +243,7 @@ CONFIG_CMDLINE=""
 #
 # At least one emulation must be selected
 #
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_NWFPE is not set
 # CONFIG_FPE_FASTFPE is not set
 # CONFIG_VFP is not set
 
@@ -250,6 +253,7 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
 
 #
 # Power management options
@@ -298,10 +302,6 @@ CONFIG_INET_TCP_DIAG=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
-
-#
-# IP: Virtual Server Configuration
-#
 # CONFIG_IP_VS is not set
 CONFIG_IPV6=m
 # CONFIG_IPV6_PRIVACY is not set
@@ -344,20 +344,8 @@ CONFIG_NETFILTER=y
 #
 # CONFIG_IP6_NF_QUEUE is not set
 # CONFIG_IP6_NF_IPTABLES is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -393,6 +381,7 @@ CONFIG_NETFILTER=y
 # CONFIG_MAC80211 is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
 
 #
 # Device Drivers
@@ -405,10 +394,6 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
@@ -494,20 +479,8 @@ CONFIG_MTD_NAND_IDS=y
 # UBI - Unsorted block images
 #
 # CONFIG_MTD_UBI is not set
-
-#
-# Parallel port support
-#
 # CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
+CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -519,10 +492,6 @@ CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 CONFIG_IDE=y
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=y
@@ -584,6 +553,7 @@ CONFIG_BLK_DEV_IDEDMA=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
 CONFIG_SCSI_PROC_FS=y
@@ -613,74 +583,28 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
-
-#
-# SCSI low-level drivers
-#
+CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ISCSI_TCP is not set
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_ESP_CORE is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
 # CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
 CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
 CONFIG_NET_ETHERNET=y
 # CONFIG_MII is not set
-CONFIG_TI_DAVINCI_EMAC=y
+# CONFIG_AX88796 is not set
 # CONFIG_SMC91X is not set
+CONFIG_TI_DAVINCI_EMAC=y
 # CONFIG_DM9000 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_MLX4_DEBUG=y
-
-#
-# Token Ring devices
-#
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
 # Wireless LAN
@@ -697,10 +621,6 @@ CONFIG_MLX4_DEBUG=y
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
@@ -711,6 +631,7 @@ CONFIG_PPP_DEFLATE=m
 # CONFIG_PPP_BSDCOMP is not set
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
+# CONFIG_PPPOL2TP is not set
 # CONFIG_SLIP is not set
 CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
@@ -718,10 +639,6 @@ CONFIG_NETCONSOLE=y
 CONFIG_NETPOLL=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
-
-#
-# ISDN subsystem
-#
 # CONFIG_ISDN is not set
 
 #
@@ -729,6 +646,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -794,26 +712,13 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-
-#
-# IPMI
-#
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_DAVINCI_RTC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
 # CONFIG_TCG_TPM is not set
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
@@ -833,6 +738,7 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_TAOS_EVM is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_TINY_USB is not set
 CONFIG_I2C_DAVINCI=y
@@ -842,13 +748,16 @@ CONFIG_I2C_DAVINCI=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 CONFIG_SENSORS_TLV320AIC23=y
-# CONFIG_SENSORS_MAX6875 is not set
 CONFIG_SENSORS_TLV320AIC33=y
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+CONFIG_GPIOEXPANDER_DAVINCI=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -859,14 +768,11 @@ CONFIG_SENSORS_TLV320AIC33=y
 #
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
 # CONFIG_W1 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
@@ -893,13 +799,16 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
@@ -909,57 +818,33 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Misc devices
-#
-# CONFIG_BLINK is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
 
 #
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
-
-#
-# LED devices
-#
 # CONFIG_NEW_LEDS is not set
 
 #
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
-
-#
-# Video Capture Adapters
-#
-
-#
-# Video Capture Adapters
-#
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+# CONFIG_VIDEO_TVP5146 is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_TUNER_3036 is not set
-# CONFIG_VIDEO_IVTV is not set
-
-#
-# V4L USB devices
-#
+# CONFIG_TUNER_TEA5761 is not set
+CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VIDEO_PVRUSB2 is not set
 # CONFIG_VIDEO_EM28XX is not set
 # CONFIG_VIDEO_USBVISION is not set
@@ -977,17 +862,11 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_USB_ZC0301 is not set
 # CONFIG_USB_PWC is not set
 # CONFIG_USB_ZR364XX is not set
-
-#
-# Radio Adapters
-#
+CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_TEA5761 is not set
 # CONFIG_USB_DSBR is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 # CONFIG_USB_DABUSB is not set
 
 #
@@ -1000,6 +879,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
@@ -1030,6 +910,7 @@ CONFIG_FB_DAVINCI=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1053,7 +934,6 @@ CONFIG_SOUND=y
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=y
-# CONFIG_OSS_OBSOLETE is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
 CONFIG_SOUND_DAVINCI=y
@@ -1064,10 +944,7 @@ CONFIG_SOUND_DAVINCI_AIC33=y
 #
 # CONFIG_MONOSTEREO_DIFFJACK is not set
 CONFIG_MONOSTEREO_SAMEJACK=y
-
-#
-# HID Devices
-#
+CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HID_DEBUG is not set
 
@@ -1084,10 +961,7 @@ CONFIG_USB_HID=m
 #
 # CONFIG_USB_KBD is not set
 # CONFIG_USB_MOUSE is not set
-
-#
-# USB support
-#
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -1098,7 +972,7 @@ CONFIG_USB=m
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_OTG is not set
 
@@ -1107,6 +981,7 @@ CONFIG_USB_DEVICEFS=y
 #
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_SOC=y
 
@@ -1197,12 +1072,15 @@ CONFIG_USB_MON=y
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
@@ -1222,17 +1100,27 @@ CONFIG_MMC=y
 # MMC/SD Card Drivers
 #
 CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
 
 #
 # MMC/SD Host Controller Drivers
 #
 # CONFIG_MMC_DAVINCI is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
 
 #
-# Real Time Clock
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
 #
-CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
 
 #
 # File systems
@@ -1350,7 +1238,6 @@ CONFIG_SMB_FS=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
 
 #
 # Partition Types
@@ -1447,10 +1334,6 @@ CONFIG_FRAME_POINTER=y
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
 # CONFIG_CRYPTO is not set
 
 #
@@ -1459,7 +1342,9 @@ CONFIG_FRAME_POINTER=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
diff --git a/packages/linux/linux-davinci_2.6.x+git-davinci.bb b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
index b4dcabedd7..0381716253 100644
--- a/packages/linux/linux-davinci_2.6.x+git-davinci.bb
+++ b/packages/linux/linux-davinci_2.6.x+git-davinci.bb
@@ -6,6 +6,7 @@ PR = "r1"
 COMPATIBLE_MACHINE = "davinci-dvevm"
 
 SRC_URI = "git://source.mvista.com/git/linux-davinci-2.6.git;protocol=git \
+           file://binutils-buildid-arm.patch;patch=1 \
            file://defconfig"
 
 S = "${WORKDIR}/git"
diff --git a/packages/linux/linux-ezx-2.6.21/a1200/defconfig b/packages/linux/linux-ezx-2.6.21/a1200/defconfig
index b40f2f6eba..074d70244b 100755
--- a/packages/linux/linux-ezx-2.6.21/a1200/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/a1200/defconfig
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1003,7 +1003,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_EZX=y
+CONFIG_BACKLIGHT_EZX=N
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
@@ -1313,12 +1313,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
diff --git a/packages/linux/linux-ezx-2.6.21/a780/defconfig b/packages/linux/linux-ezx-2.6.21/a780/defconfig
index f79aaa7e7d..30f9f72174 100755
--- a/packages/linux/linux-ezx-2.6.21/a780/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/a780/defconfig
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1317,12 +1317,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
diff --git a/packages/linux/linux-ezx-2.6.21/e680/defconfig b/packages/linux/linux-ezx-2.6.21/e680/defconfig
index 94947cceb3..9a30ce673f 100755
--- a/packages/linux/linux-ezx-2.6.21/e680/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/e680/defconfig
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1311,12 +1311,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=n
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
diff --git a/packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch b/packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch
index e6146058a0..77aec1c629 100644
--- a/packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch
@@ -1,73 +1,15 @@
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:38:52.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:48:23.000000000 -0300
-@@ -25,6 +25,7 @@
- #include <asm/arch/mmc.h>
- 
- #include "generic.h"
-+#include "ezx-eoc.h"
- 
- extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
- extern void ezx_backlight_power(int);
-@@ -203,8 +204,65 @@
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-24 20:14:54.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-24 20:15:18.000000000 -0300
+@@ -203,8 +203,15 @@
  	},
  };
  
 +
-+/* EOC */
-+static const unsigned int tab_init_eoc_reg[][2] =
-+{
-+    {POWER_IC_REG_EOC_INT_MASK,        0x00000FEF},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_0, 0x00000C00},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_1, 0x0000000C},
-+    {POWER_IC_REG_EOC_CONN_CONTROL,    0x00021044},
-+};
-+
-+static void dump_eoc_registers(void)
-+{
-+	int i, val = 0;
-+
-+	printk("========DUMP EOC=========\n");
-+	for (i = 0; i < POWER_IC_REG_EOC_NUM; i++) {
-+		eoc_reg_read(i, &val);
-+		printk("eoc_registers[%d] = 0x%08X\n", i, val);
-+	}
-+	printk("========END DUMP=========\n");
-+}
-+
-+/*
-+ * FIXME: The same about the PCAP driver applies here.
-+ * This is the initial state only.
-+ * Which bits does the change to USB/UART/AUDIO mode?
-+ * I think that this is causing the crash on pxa27x-udc
-+ * you are setting the 'port connected' bit, and thats why
-+ * you are getting interrupts early.
-+ * --WM
-+ */
-+
-+static int __init a1200_eoc_init(void)
-+{
-+    int i;
-+
-+    for (i = 0; i < sizeof(tab_init_eoc_reg)/sizeof(unsigned int)/2; i++)
-+    {
-+		eoc_reg_write(tab_init_eoc_reg[i][0], tab_init_eoc_reg[i][1]);
-+    }
-+	dump_eoc_registers();
-+	return 0;
-+}
-+
-+static struct ezx_eoc_platform_data a1200_eoc_platform_data = {
-+	.init		= a1200_eoc_init,
-+};
-+
 +struct platform_device a1200_eoc_device = {
 +	.name		= "ezx-eoc",
 +	.id		= -1,
-+	.dev		= {
-+		.platform_data = &a1200_eoc_platform_data,
-+	},
 +};
 +
  static struct platform_device *devices[] __initdata = {
diff --git a/packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch b/packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch
new file mode 100644
index 0000000000..fc51773205
--- /dev/null
+++ b/packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch
@@ -0,0 +1,47 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:53.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:01:06.000000000 -0300
+@@ -16,6 +16,7 @@
+ #include <linux/mmc/host.h>
+ #include <linux/irq.h>
+ #include <linux/input.h>
++#include <linux/gpio_keys.h>
+ 
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -292,11 +293,34 @@
+ 	.num_resources  = ARRAY_SIZE(pcap_ts_resources),
+ 	.resource       = pcap_ts_resources,
+ };
++/* Flip */
++#undef GPIO_FLIP_PIN
++#define GPIO_FLIP_PIN 15 /* FIXME */
++static struct gpio_keys_button a1200flip_buttons[] = {
++	[0] = {
++        	.keycode        = KEY_SLEEP,
++		.gpio           = GPIO_FLIP_PIN,
++		.desc           = "A1200 flip",
++	},
++};
++
++static struct gpio_keys_platform_data a1200flip_platform_data = {
++	.buttons        = a1200flip_buttons,
++	.nbuttons       = 1,
++};
++static struct platform_device a1200flip_device = {
++	.name           = "gpio-keys",
++	.id             = -1,
++	.dev            = {
++		.platform_data  = &a1200flip_platform_data,
++	},
++};
+ 
+ static struct platform_device *devices[] __initdata = {
+ 	&a1200_pcap_device,
+ 	&a1200_eoc_device,
+ 	&pcap_ts_device,
++	&a1200flip_device,
+ };
+ 
+ static void __init a1200_init(void)
diff --git a/packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch b/packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch
new file mode 100644
index 0000000000..5771f6d359
--- /dev/null
+++ b/packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch
@@ -0,0 +1,98 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 00:03:01.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:40.000000000 -0300
+@@ -15,6 +15,7 @@
+ #include <linux/fb.h>
+ #include <linux/mmc/host.h>
+ #include <linux/irq.h>
++#include <linux/input.h>
+ 
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -23,11 +24,13 @@
+ #include <asm/arch/ezx.h>
+ #include <asm/arch/ezx-pcap.h>
+ #include <asm/arch/mmc.h>
++#include <asm/arch/kbd.h>
+ 
+ #include "generic.h"
+ 
+ extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
+ extern void ezx_backlight_power(int);
++extern void __init pxa_set_kbd_info(struct pxakbd_platform_data *);
+ 
+ #ifdef CONFIG_EZX_PCAP
+ extern int ezx_pcap_mmcsd_power(int);
+@@ -209,6 +212,63 @@
+ 	.id		= -1,
+ };
+ 
++/* Keypad */
++static unsigned char a1200_keycode[] = {
++	/* row 0 */
++	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
++	/* row 1 */
++	KEY_RIGHT, KEY_DOWN, KEY_KPENTER, KEY_UP, KEY_LEFT,
++	/* row 2 */
++	KEY_PAGEDOWN, KEY_CAMERA, KEY_RECORD, KEY_HOME, KEY_PAGEUP,
++	/* row 3 */
++	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
++	/* row 4 */
++	KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
++	/* row 5 */
++	KEY_RESERVED, KEY_RESERVED, KEY_MENU, KEY_RESERVED, KEY_RESERVED,
++};
++/*
++static unsigned char a1200_direct_keycode[] = {
++	KEY_CAMERA,
++};
++*/
++
++static int a1200_kbd_init(void)
++{
++	pxa_gpio_mode(100 | GPIO_ALT_FN_1_IN); /* KP_MKIN<0> */
++	pxa_gpio_mode(101 | GPIO_ALT_FN_1_IN); /* KP_MKIN<1> */
++	pxa_gpio_mode(102 | GPIO_ALT_FN_1_IN); /* KP_MKIN<2> */
++	pxa_gpio_mode(97  | GPIO_ALT_FN_3_IN); /* KP_MKIN<3> */
++	pxa_gpio_mode(98  | GPIO_ALT_FN_3_IN); /* KP_MKIN<4> */
++	pxa_gpio_mode(103 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<0> */
++	pxa_gpio_mode(104 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<1> */
++	pxa_gpio_mode(105 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<2> */
++	pxa_gpio_mode(106 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<3> */
++	pxa_gpio_mode(107 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<4> */
++	pxa_gpio_mode(108 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<5> */
++
++	PKWR   = 0xEC000;
++	PGSR3 |= 0x1F80;
++	return 0;
++}
++
++static struct pxakbd_platform_data a1200_kbd_platform_data = {
++	.init           = &a1200_kbd_init,
++	.scan_interval  = HZ/40,
++	.matrix         = {
++		.keycode = a1200_keycode,
++		.cols   = 6,
++		.rows   = 5,
++	},
++/*
++	.direct         = {
++		.keycode = a1200_direct_keycode,
++		.num    = 1,
++	},
++*/
++};
++
++
+ static struct platform_device *devices[] __initdata = {
+ 	&a1200_pcap_device,
+ 	&a1200_eoc_device,
+@@ -218,6 +278,7 @@
+ {
+ 	set_pxa_fb_info(&a1200_fb_info);
+ 	pxa_set_mci_info(&a1200_mci_platform_data);
++	pxa_set_kbd_info(&a1200_kbd_platform_data);
+ 
+ 	platform_add_devices(devices, ARRAY_SIZE(devices));
+ }
diff --git a/packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch b/packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch
index 2327257507..bf328cd931 100755
--- a/packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch
@@ -1,11 +1,11 @@
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:50:31.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-21 21:51:06.000000000 -0300
-@@ -260,9 +260,34 @@
- 	},
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:40.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-25 02:00:53.000000000 -0300
+@@ -269,9 +269,34 @@
  };
  
+ 
 +/* PCAP_TS */
 +struct resource pcap_ts_resources[] = {
 +	[0] = {
diff --git a/packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch b/packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch
index f6e152c735..3824079c15 100644
--- a/packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch
@@ -1,73 +1,15 @@
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:38:52.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:49:42.000000000 -0300
-@@ -25,6 +25,7 @@
- #include <asm/arch/mmc.h>
- 
- #include "generic.h"
-+#include "ezx-eoc.h"
- 
- extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
- extern void ezx_backlight_power(int);
-@@ -203,8 +204,65 @@
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-24 20:14:54.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-24 20:15:18.000000000 -0300
+@@ -203,8 +203,15 @@
  	},
  };
  
 +
-+/* EOC */
-+static const unsigned int tab_init_eoc_reg[][2] =
-+{
-+    {POWER_IC_REG_EOC_INT_MASK,        0x00000FEF},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_0, 0x00000C00},
-+    {POWER_IC_REG_EOC_POWER_CONTROL_1, 0x0000000C},
-+    {POWER_IC_REG_EOC_CONN_CONTROL,    0x00021044},
-+};
-+
-+static void dump_eoc_registers(void)
-+{
-+	int i, val = 0;
-+
-+	printk("========DUMP EOC=========\n");
-+	for (i = 0; i < POWER_IC_REG_EOC_NUM; i++) {
-+		eoc_reg_read(i, &val);
-+		printk("eoc_registers[%d] = 0x%08X\n", i, val);
-+	}
-+	printk("========END DUMP=========\n");
-+}
-+
-+/*
-+ * FIXME: The same about the PCAP driver applies here.
-+ * This is the initial state only.
-+ * Which bits does the change to USB/UART/AUDIO mode?
-+ * I think that this is causing the crash on pxa27x-udc
-+ * you are setting the 'port connected' bit, and thats why
-+ * you are getting interrupts early.
-+ * --WM
-+ */
-+
-+static int __init e6_eoc_init(void)
-+{
-+    int i;
-+
-+    for (i = 0; i < sizeof(tab_init_eoc_reg)/sizeof(unsigned int)/2; i++)
-+    {
-+		eoc_reg_write(tab_init_eoc_reg[i][0], tab_init_eoc_reg[i][1]);
-+    }
-+	dump_eoc_registers();
-+	return 0;
-+}
-+
-+static struct ezx_eoc_platform_data e6_eoc_platform_data = {
-+	.init		= e6_eoc_init,
-+};
-+
 +struct platform_device e6_eoc_device = {
 +	.name		= "ezx-eoc",
 +	.id		= -1,
-+	.dev		= {
-+		.platform_data = &e6_eoc_platform_data,
-+	},
 +};
 +
  static struct platform_device *devices[] __initdata = {
diff --git a/packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch b/packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch
index a39b782300..ad4a52eeec 100644
--- a/packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch
@@ -1,9 +1,9 @@
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:50:31.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-21 21:51:40.000000000 -0300
-@@ -260,9 +260,34 @@
- 	},
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-25 00:03:01.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-25 02:00:58.000000000 -0300
+@@ -209,9 +209,34 @@
+ 	.id		= -1,
  };
  
 +/* PCAP_TS */
diff --git a/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch b/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
index 653e814fb4..711a8a467b 100755
--- a/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.21/arch/arm/boot/compressed/head-xscale.S
 ===================================================================
---- linux-2.6.21.orig/arch/arm/boot/compressed/head-xscale.S	2007-06-28 16:51:44.000000000 -0300
-+++ linux-2.6.21/arch/arm/boot/compressed/head-xscale.S	2007-06-28 16:51:50.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/boot/compressed/head-xscale.S	2007-09-23 13:27:06.000000000 -0300
++++ linux-2.6.21/arch/arm/boot/compressed/head-xscale.S	2007-09-23 13:27:19.000000000 -0300
 @@ -53,3 +53,6 @@
  		str	r1, [r0, #0x18]
  #endif
@@ -11,8 +11,8 @@ Index: linux-2.6.21/arch/arm/boot/compressed/head-xscale.S
 +#endif
 Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig	2007-06-28 16:51:44.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/Kconfig	2007-06-28 20:54:54.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig	2007-09-23 13:27:06.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/Kconfig	2007-09-23 13:27:19.000000000 -0300
 @@ -37,6 +37,10 @@
  	bool "Keith und Koep Trizeps4 DIMM-Module"
  	select PXA27x
@@ -68,8 +68,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig
  endif
 Index: linux-2.6.21/arch/arm/mach-pxa/Makefile
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile	2007-06-28 16:51:44.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/Makefile	2007-06-28 20:54:54.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile	2007-09-23 13:27:06.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/Makefile	2007-09-23 13:27:19.000000000 -0300
 @@ -18,6 +18,12 @@
  obj-$(CONFIG_MACH_AKITA)	+= akita-ioexp.o
  obj-$(CONFIG_MACH_POODLE)	+= poodle.o corgi_ssp.o
@@ -86,7 +86,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Makefile
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx.c	2007-06-28 20:54:54.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx.c	2007-09-23 13:27:19.000000000 -0300
 @@ -0,0 +1,118 @@
 +/*
 + *  ezx.c - Common code for EZX platform.
@@ -209,7 +209,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx.c
 Index: linux-2.6.21/include/asm-arm/arch-pxa/ezx.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/include/asm-arm/arch-pxa/ezx.h	2007-06-28 16:51:50.000000000 -0300
++++ linux-2.6.21/include/asm-arm/arch-pxa/ezx.h	2007-09-23 13:27:19.000000000 -0300
 @@ -0,0 +1,225 @@
 +/*
 + *  linux/include/asm-arm/arch-pxa/ezx.h
@@ -438,9 +438,9 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/ezx.h
 +
 Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
 ===================================================================
---- linux-2.6.21.orig/include/asm-arm/arch-pxa/pxa-regs.h	2007-06-28 16:51:44.000000000 -0300
-+++ linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h	2007-06-28 18:18:49.000000000 -0300
-@@ -849,6 +849,8 @@
+--- linux-2.6.21.orig/include/asm-arm/arch-pxa/pxa-regs.h	2007-09-23 13:27:13.000000000 -0300
++++ linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h	2007-09-23 13:27:19.000000000 -0300
+@@ -856,6 +856,8 @@
  #define UP2OCR_HXOE		(1 << 17)	/* Host Port 2 Transceiver Output Enable */
  #define UP2OCR_SEOS		(1 << 24)	/* Single-Ended Output Select */
  
@@ -449,7 +449,7 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define UDCCSN(x)	__REG2(0x40600100, (x) << 2)
  #define UDCCSR0         __REG(0x40600100) /* UDC Control/Status register - Endpoint 0 */
  #define UDCCSR0_SA	(1 << 7)	/* Setup Active */
-@@ -1252,6 +1254,7 @@
+@@ -1259,6 +1261,7 @@
  #define GPIO33_nCS_5		33	/* chip select 5 */
  #define GPIO34_FFRXD		34	/* FFUART receive */
  #define GPIO34_MMCCS0		34	/* MMC Chip Select 0 */
@@ -457,7 +457,7 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define GPIO35_FFCTS		35	/* FFUART Clear to send */
  #define GPIO36_FFDCD		36	/* FFUART Data carrier detect */
  #define GPIO37_FFDSR		37	/* FFUART data set ready */
-@@ -1365,6 +1368,7 @@
+@@ -1372,6 +1375,7 @@
  #define GPIO18_RDY_MD		(18 | GPIO_ALT_FN_1_IN)
  #define GPIO19_DREQ1_MD		(19 | GPIO_ALT_FN_1_IN)
  #define GPIO20_DREQ0_MD		(20 | GPIO_ALT_FN_1_IN)
@@ -465,7 +465,7 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define GPIO23_SCLK_MD		(23 | GPIO_ALT_FN_2_OUT)
  #define GPIO24_SFRM_MD		(24 | GPIO_ALT_FN_2_OUT)
  #define GPIO25_STXD_MD		(25 | GPIO_ALT_FN_2_OUT)
-@@ -1375,23 +1379,33 @@
+@@ -1382,23 +1386,33 @@
  #define GPIO28_BITCLK_OUT_I2S_MD	(28 | GPIO_ALT_FN_1_OUT)
  #define GPIO29_SDATA_IN_AC97_MD	(29 | GPIO_ALT_FN_1_IN)
  #define GPIO29_SDATA_IN_I2S_MD	(29 | GPIO_ALT_FN_2_IN)
@@ -499,7 +499,7 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define GPIO41_FFRTS_MD		(41 | GPIO_ALT_FN_2_OUT)
  #define GPIO42_BTRXD_MD		(42 | GPIO_ALT_FN_1_IN)
  #define GPIO42_HWRXD_MD		(42 | GPIO_ALT_FN_3_IN)
-@@ -1416,13 +1430,17 @@
+@@ -1423,13 +1437,17 @@
  #define GPIO51_HWRTS_MD         (51 | GPIO_ALT_FN_1_OUT)
  #define GPIO51_nPIOW_MD		(51 | GPIO_ALT_FN_2_OUT)
  #define GPIO52_nPCE_1_MD	(52 | GPIO_ALT_FN_2_OUT)
@@ -517,7 +517,7 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define GPIO57_nIOIS16_MD	(57 | GPIO_ALT_FN_1_IN)
  #define GPIO58_LDD_0_MD		(58 | GPIO_ALT_FN_2_OUT)
  #define GPIO59_LDD_1_MD		(59 | GPIO_ALT_FN_2_OUT)
-@@ -1458,13 +1476,19 @@
+@@ -1465,13 +1483,19 @@
  #define GPIO80_nCS_4_MD		(80 | GPIO_ALT_FN_2_OUT)
  #define GPIO81_NSSP_CLK_OUT 	(81 | GPIO_ALT_FN_1_OUT)
  #define GPIO81_NSSP_CLK_IN  	(81 | GPIO_ALT_FN_1_IN)
@@ -537,7 +537,7 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define GPIO92_MMCDAT0_MD	(92 | GPIO_ALT_FN_1_OUT)
  #define GPIO102_nPCE_1_MD	(102 | GPIO_ALT_FN_1_OUT)
  #define GPIO104_pSKTSEL_MD	(104 | GPIO_ALT_FN_1_OUT)
-@@ -1476,6 +1500,7 @@
+@@ -1483,6 +1507,7 @@
  #define GPIO112_MMCCMD_MD	(112 | GPIO_ALT_FN_1_OUT)
  #define GPIO113_I2S_SYSCLK_MD	(113 | GPIO_ALT_FN_1_OUT)
  #define GPIO113_AC97_RESET_N_MD	(113 | GPIO_ALT_FN_2_OUT)
@@ -545,7 +545,7 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define GPIO117_I2CSCL_MD	(117 | GPIO_ALT_FN_1_IN)
  #define GPIO118_I2CSDA_MD	(118 | GPIO_ALT_FN_1_IN)
  
-@@ -1491,6 +1516,7 @@
+@@ -1498,6 +1523,7 @@
  #define PFER		__REG(0x40F00014)  /* Power Manager GPIO Falling-Edge Detect Enable Register */
  #define PEDR		__REG(0x40F00018)  /* Power Manager GPIO Edge Detect Status Register */
  #define PCFR		__REG(0x40F0001C)  /* Power Manager General Configuration Register */
@@ -555,8 +555,8 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/pxa-regs.h
  #define PGSR2		__REG(0x40F00028)  /* Power Manager GPIO Sleep State Register for GP[84-64] */
 Index: linux-2.6.21/arch/arm/boot/compressed/head.S
 ===================================================================
---- linux-2.6.21.orig/arch/arm/boot/compressed/head.S	2007-06-28 16:51:44.000000000 -0300
-+++ linux-2.6.21/arch/arm/boot/compressed/head.S	2007-06-28 16:51:50.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/boot/compressed/head.S	2007-09-23 13:27:06.000000000 -0300
++++ linux-2.6.21/arch/arm/boot/compressed/head.S	2007-09-23 13:27:19.000000000 -0300
 @@ -117,6 +117,9 @@
  		mov	r0, r0
  		.endr
@@ -569,8 +569,8 @@ Index: linux-2.6.21/arch/arm/boot/compressed/head.S
  		.word	start			@ absolute load/run zImage address
 Index: linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h
 ===================================================================
---- linux-2.6.21.orig/include/asm-arm/arch-pxa/uncompress.h	2007-06-28 16:51:44.000000000 -0300
-+++ linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h	2007-06-28 16:51:50.000000000 -0300
+--- linux-2.6.21.orig/include/asm-arm/arch-pxa/uncompress.h	2007-09-23 13:27:06.000000000 -0300
++++ linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h	2007-09-23 13:27:19.000000000 -0300
 @@ -14,14 +14,14 @@
  #define STUART		((volatile unsigned long *)0x40700000)
  #define HWUART		((volatile unsigned long *)0x41600000)
@@ -591,8 +591,8 @@ Index: linux-2.6.21/include/asm-arm/arch-pxa/uncompress.h
  /*
 Index: linux-2.6.21/arch/arm/mm/init.c
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mm/init.c	2007-06-28 16:51:44.000000000 -0300
-+++ linux-2.6.21/arch/arm/mm/init.c	2007-06-28 16:51:50.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mm/init.c	2007-09-23 13:27:07.000000000 -0300
++++ linux-2.6.21/arch/arm/mm/init.c	2007-09-23 13:27:19.000000000 -0300
 @@ -241,6 +241,10 @@
  	 */
  	reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT,
@@ -607,7 +607,7 @@ Index: linux-2.6.21/arch/arm/mm/init.c
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c	2007-06-28 20:53:01.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c	2007-09-23 13:27:19.000000000 -0300
 @@ -0,0 +1,88 @@
 +/*
 + *  ezx-a780.c - Code specific to A780 GSM Phone.
@@ -700,7 +700,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a780.c
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c	2007-06-28 20:54:24.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c	2007-09-23 13:27:19.000000000 -0300
 @@ -0,0 +1,70 @@
 +/*
 + *  ezx-e2.c - Code specific to E2 GSM Phone.
@@ -748,7 +748,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c
 +       .num_modes = 1,
 +       .lccr0 = 0x022008B8,
 +       .lccr3 = 0xC130FF13,
-+       .pxafb_backlight_power = ezx_backlight_power,
++       .pxafb_backlight_power = &ezx_backlight_power,
 +       .pxafb_lcd_power = &ezx_lcd_power,
 +};
 +
@@ -766,7 +766,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c
 +	/* Maintainer: OpenEZX Team (www.openezx.org) */
 +	.phys_io 	= 0x40000000,
 +	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,
-+	.boot_params	= 0xa0000100,
++	.boot_params	= 0xa0000200,
 +	.map_io		= pxa_map_io,
 +	.init_irq	= pxa_init_irq,
 +	.timer		= &pxa_timer,
@@ -775,7 +775,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e2.c
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c	2007-06-28 20:53:29.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c	2007-09-23 13:27:19.000000000 -0300
 @@ -0,0 +1,87 @@
 +/*
 + *  ezx-e680.c - Code specific to E680 GSM Phone.
@@ -867,7 +867,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e680.c
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-06-28 20:53:48.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-23 13:27:19.000000000 -0300
 @@ -0,0 +1,70 @@
 +/*
 + *  ezx-a1200.c - Code specific to A1200 GSM Phone.
@@ -915,7 +915,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 +       .num_modes = 1,
 +       .lccr0 = 0x022008B8,
 +       .lccr3 = 0xC130FF13,
-+       .pxafb_backlight_power = ezx_backlight_power,
++       .pxafb_backlight_power = &ezx_backlight_power,
 +       .pxafb_lcd_power = &ezx_lcd_power,
 +};
 +
@@ -933,7 +933,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 +	/* Maintainer: OpenEZX Team (www.openezx.org) */
 +	.phys_io 	= 0x40000000,
 +	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,
-+	.boot_params	= 0xa0000100,
++	.boot_params	= 0xa0000200,
 +	.map_io		= pxa_map_io,
 +	.init_irq	= pxa_init_irq,
 +	.timer		= &pxa_timer,
@@ -942,7 +942,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-06-28 20:54:07.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-23 13:27:19.000000000 -0300
 @@ -0,0 +1,70 @@
 +/*
 + *  ezx-e6.c - Code specific to E6 GSM Phone.
@@ -990,7 +990,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
 +       .num_modes = 1,
 +       .lccr0 = 0x022008B8,
 +       .lccr3 = 0xC130FF13,
-+       .pxafb_backlight_power = ezx_backlight_power,
++       .pxafb_backlight_power = &ezx_backlight_power,
 +       .pxafb_lcd_power = &ezx_lcd_power,
 +};
 +
@@ -1008,7 +1008,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
 +	/* Maintainer: OpenEZX Team (www.openezx.org) */
 +	.phys_io 	= 0x40000000,
 +	.io_pg_offst	= (io_p2v(0x40000000) >> 18) & 0xfffc,
-+	.boot_params	= 0xa0000100,
++	.boot_params	= 0xa0000200,
 +	.map_io		= pxa_map_io,
 +	.init_irq	= pxa_init_irq,
 +	.timer		= &pxa_timer,
diff --git a/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch b/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
index 77c79fd107..bf93ebc854 100644
--- a/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
@@ -1,8 +1,8 @@
 Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c	2007-09-11 20:14:33.000000000 -0300
-@@ -0,0 +1,267 @@
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c	2007-09-24 23:40:45.000000000 -0300
+@@ -0,0 +1,260 @@
 +/*
 + *  EZX EOC Driver for Motorola EZX phones
 + *
@@ -21,8 +21,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 +#include <asm/arch/hardware.h>
 +#include <asm/arch/pxa-regs.h>
 +#include <asm/arch/ezx.h>
-+
-+#include "ezx-eoc.h"
++#include <asm/arch/udc.h>
 +
 +#if 1
 +#define EOC_DBG printk
@@ -30,25 +29,23 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 +#define EOC_DBG(x, args...)
 +#endif
 +
++#define REG_INT_STATUS 32
++#define REG_INT_MASK 33
++#define REG_INT_SENSE 34
++#define REG_POWER_CONTROL_0 35
++#define REG_POWER_CONTROL_1 36
++#define REG_CONN_CONTROL 37
++
 +#define EOC_REG_ADDR_SIZE  1
 +#define EOC_REG_DATA_SIZE  3
++#define EOC_FUNC_NOTHING 0
++#define EOC_FUNC_USB_NET 1
 +
-+struct ezx_eoc_platform_data *pdata;
-+static int eoc_func = EOC_FUNC_USB_NET;
 +static const char eoc_i2c_driver_name[] = "ezx-eoc";
-+
-+/* Addresses to scan */
-+static unsigned short normal_i2c[] = {
-+    0x17,        /* Address for version 2.0 and above  */
-+   // 0x7C,      /* Address for versions prior too 2.0 */
-+	I2C_CLIENT_END
-+};
-+
-+/* I2C Magic */
-+I2C_CLIENT_INSMOD;
++static int eoc_func = EOC_FUNC_USB_NET;
++static struct pxa2xx_udc_mach_info ezx_udc_info;
 +
 +static int ezx_eoc_attach_adapter(struct i2c_adapter *adapter);
-+static int ezx_eoc_detect(struct i2c_adapter *adapter, int address, int kind);
 +static int ezx_eoc_detach_client(struct i2c_client *client);
 +
 +static struct i2c_client *eoc_i2c_client = NULL;
@@ -57,82 +54,68 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 +	.driver = {
 +		.name	= (char *)eoc_i2c_driver_name,
 +	},
-+	.id		= I2C_DRIVERID_EEPROM,
 +	.attach_adapter	= ezx_eoc_attach_adapter,
 +	.detach_client	= ezx_eoc_detach_client,
 +};
 +
 +int eoc_reg_read(int reg, unsigned int *reg_value)
 +{
-+    unsigned char reg_num = reg;
-+    unsigned char value[EOC_REG_DATA_SIZE];
-+    int retval;
-+
-+    struct i2c_msg msgs[2] =
-+    {
-+        { 0, 0, EOC_REG_ADDR_SIZE, &reg_num },
-+        { 0, I2C_M_RD, EOC_REG_DATA_SIZE, value }
-+    };
-+
-+    /* check if we have initialized */ /*not necessary --WM
-+    if (eoc_i2c_client == NULL)
-+    {
-+        EOC_DBG("eoc_reg_read: not initialized\n");
-+        return -EINVAL;
-+    }
-+*/
-+	msgs[0].addr = msgs[1].addr = eoc_i2c_client->addr;
-+
-+    /* transfer message to client */
-+    retval = i2c_transfer(eoc_i2c_client->adapter, msgs, 2);
-+    if (retval >= 0)
-+    {
-+		*reg_value  = (value[2] <<  0);
-+        *reg_value |= (value[1] <<  8);
-+        *reg_value |= (value[0] << 16);
-+    }
-+    return retval;
++	unsigned char reg_num = reg;
++	unsigned char value[EOC_REG_DATA_SIZE];
++	int retval;
++
++	struct i2c_msg msgs[2] =
++	{
++		{ eoc_i2c_client->addr, 0, EOC_REG_ADDR_SIZE, &reg_num },
++		{ eoc_i2c_client->addr, I2C_M_RD, EOC_REG_DATA_SIZE, value }
++	};
++
++	/* transfer message to client */
++	retval = i2c_transfer(eoc_i2c_client->adapter, msgs, 2);
++	if (retval < 0)
++		return retval;
++
++	*reg_value  = (value[2] <<  0);
++	*reg_value |= (value[1] <<  8);
++	*reg_value |= (value[0] << 16);
++	return 0;
 +}
-+EXPORT_SYMBOL_GPL(eoc_reg_read);
 +
 +int eoc_reg_write(int reg, unsigned int reg_value)
 +{
-+    unsigned char value[EOC_REG_ADDR_SIZE + EOC_REG_DATA_SIZE];
-+    int retval;
-+
-+    /* check if we have initialized */ /*not necessary --WM
-+    if (eoc_i2c_client == NULL)
-+    {
-+        EOC_DBG("eoc_reg_write: not initialized\n");
-+        return -EINVAL;
-+    }
-+*/
-+    /* Copy the data into a buffer into the correct format */
-+    value[0] = reg;
-+    value[1] = (reg_value >> 16) & 0xFF;
-+    value[2] = (reg_value >>  8) & 0xFF;
-+    value[3] = (reg_value >>  0) & 0xFF;
-+
-+    /* Write the data to the EOC */
-+    retval = i2c_master_send (eoc_i2c_client, value, EOC_REG_ADDR_SIZE + EOC_REG_DATA_SIZE);
-+
-+    return retval;
++	unsigned char value[EOC_REG_ADDR_SIZE + EOC_REG_DATA_SIZE];
++	int retval;
++
++	/* Copy the data into a buffer into the correct format */
++	value[0] = reg;
++	value[1] = (reg_value >> 16) & 0xFF;
++	value[2] = (reg_value >>  8) & 0xFF;
++	value[3] = (reg_value >>  0) & 0xFF;
++
++	/* Write the data to the EOC */
++	retval = i2c_master_send (eoc_i2c_client, value, EOC_REG_ADDR_SIZE + EOC_REG_DATA_SIZE);
++	if (retval < 0)
++		return retval;
++	return 0;
 +}
-+EXPORT_SYMBOL_GPL(eoc_reg_write);
 +
 +static void eoc_switch_to_usb(void)
 +{
++	EOC_DBG("EOC: Switching to USB\n");
 +	pxa_gpio_mode(GPIO34_USB_P2_2_MD);
 +	pxa_gpio_mode(GPIO35_USB_P2_1_MD);
 +	pxa_gpio_mode(GPIO36_USB_P2_4_MD);
 +	pxa_gpio_mode(GPIO39_USB_P2_6_MD);
 +	pxa_gpio_mode(GPIO40_USB_P2_5_MD);
 +	pxa_gpio_mode(GPIO53_USB_P2_3_MD);
-+	EOC_DBG("ALEX;*********************************************emu_switch_to_usb;\n");
++	UP2OCR = 0x02000000;
++	/* FIXME change eoc bits to USB */
++
 +}
 +
 +static void eoc_switch_to_nothing(void)
 +{
++	EOC_DBG("EOC: Switching do disconnected\n");
 +	pxa_gpio_mode(GPIO34_TXENB | GPIO_OUT);
 +	set_GPIO(GPIO34_TXENB);
 +	pxa_gpio_mode(GPIO35_XRXD  | GPIO_IN);
@@ -140,6 +123,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 +	pxa_gpio_mode(GPIO39_VPOUT | GPIO_IN);
 +	pxa_gpio_mode(GPIO40_VPIN  | GPIO_IN);
 +	pxa_gpio_mode(GPIO53_VMIN  | GPIO_IN);
++	/* FIXME disconnect mini usb port */
 +}
 +
 +static void eoc_switch_to_default(void)
@@ -154,73 +138,56 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 +	}
 +}
 +
-+
 +static int ezx_eoc_attach_adapter(struct i2c_adapter *adapter)
 +{
-+	return i2c_probe(adapter, &addr_data, ezx_eoc_detect);
-+}
-+
-+/* This function is called by i2c_probe */
-+static int ezx_eoc_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+	struct i2c_client *new_client;
 +	int err = 0;
++	EOC_DBG(">>>>attach adapter enter\n");
++
++	if (eoc_i2c_client != NULL) {
++		EOC_DBG(">>>>already loaded!!!\n");
++		return 0;
++	}
 +
-+	if (!(new_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)))
++	if (!(eoc_i2c_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)))
 +		return -ENOMEM;
 +
-+	new_client->addr = address;
-+	new_client->adapter = adapter;
-+	new_client->driver = &eoc_i2c_driver;
-+	new_client->flags = 0;
-+	strlcpy(new_client->name, eoc_i2c_driver_name, I2C_NAME_SIZE);
++	eoc_i2c_client->addr = 0x17;
++	eoc_i2c_client->adapter = adapter;
++	eoc_i2c_client->driver = &eoc_i2c_driver;
++	eoc_i2c_client->flags = 0;
++	strlcpy(eoc_i2c_client->name, eoc_i2c_driver_name, I2C_NAME_SIZE);
 +
-+	if ((err = i2c_attach_client(new_client))) {
-+		kfree(new_client);
++	if ((err = i2c_attach_client(eoc_i2c_client))) {
++		kfree(eoc_i2c_client);
++		eoc_i2c_client = NULL;
 +		return err;
 +	}
-+
-+	eoc_i2c_client = new_client;
-+
-+	if (pdata && pdata->init)
-+		pdata->init();
++	eoc_reg_write(REG_INT_MASK, 0x0000FEF);
++	eoc_reg_write(REG_POWER_CONTROL_0, 0x0000C00);
++	eoc_reg_write(REG_POWER_CONTROL_1, 0x000000C);
++	eoc_reg_write(REG_CONN_CONTROL,0x0021044);
 +
 +	eoc_switch_to_default();
-+
++	EOC_DBG(">>>>attach adapter exit\n");
 +	return 0;
++
 +}
 +
 +static int ezx_eoc_detach_client(struct i2c_client *client)
 +{
-+	int err;
-+
-+	err = i2c_detach_client(client);
-+	if (err)
-+		return err;
-+
-+	return 0;
++	return i2c_detach_client(client);
 +}
 +
 +static int __init ezx_eoc_probe(struct platform_device *dev)
 +{
 +	int ret;
 +
-+	 pdata = dev->dev.platform_data;
-+
 +	ret = i2c_add_driver(&eoc_i2c_driver);
 +	if (ret != 0)
 +		return -EINVAL;
-+	
-+	/* 
-+	 * I think we should save platform_data and call init and eoc_switch
-+	 * from ezx_eoc_detect, after client is setup.
-+	 * And there is no need for all the "check if initialised" checks if 
-+	 * you assure that you only call read/write after the client is set.
-+	 * Probably, this was causing the crash on i2c-core too.
-+	 * --WM
-+	 */
-+
-+	/* FIXME: should set udc_info here -WM */
++
++	pxa_set_udc_info(&ezx_udc_info);
++
 +	return 0;
 +}
 +
@@ -241,6 +208,34 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 +	return 0;
 +}
 +
++/* USB Device Controller */
++static int udc_connected_status;
++static void ezx_udc_command(int cmd)
++{
++	switch (cmd) {
++	case PXA2XX_UDC_CMD_DISCONNECT:
++		printk(KERN_NOTICE "USB cmd disconnect\n");
++//		ezx_pcap_bit_set(PCAP_BIT_BUSCTRL_USB_PU,0);
++		udc_connected_status = 0;
++		break;
++	case PXA2XX_UDC_CMD_CONNECT:
++		printk(KERN_NOTICE "USB cmd connect\n");
++//		ezx_pcap_bit_set(PCAP_BIT_BUSCTRL_USB_PU,1);
++		udc_connected_status = 1;
++		break;
++	}
++}
++
++static int ezx_udc_is_connected(void)
++{
++	return udc_connected_status;
++}
++
++static struct pxa2xx_udc_mach_info ezx_udc_info __initdata = {
++	.udc_is_connected       = ezx_udc_is_connected,
++	.udc_command            = ezx_udc_command,
++};
++
 +static struct platform_driver ezx_eoc_driver = {
 +	.probe		= ezx_eoc_probe,
 +	.remove		= ezx_eoc_remove,
@@ -266,52 +261,12 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
 +MODULE_DESCRIPTION("EZX EOC I2C driver");
 +MODULE_LICENSE("GPL");
 +
-+/* doesnt module_init work?? -WM */
-+/*late_initcall(ezx_eoc_init);*/
 +module_init(ezx_eoc_init);
 +module_exit(ezx_eoc_exit);
-Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.h	2007-09-09 21:46:27.000000000 -0300
-@@ -0,0 +1,33 @@
-+/*
-+ *  linux/arch/arm/mach-pxa/ezx-eoc.h
-+ *
-+ * Copyright (C) Alex Zhang <celeber2@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#ifndef __EZX_EOC_H__
-+#define __EZX_EOC_H__
-+
-+enum {
-+    POWER_IC_REG_EOC_INT_STATUS,
-+    POWER_IC_REG_EOC_INT_MASK,
-+    POWER_IC_REG_EOC_INT_SENSE,
-+    POWER_IC_REG_EOC_POWER_CONTROL_0,
-+    POWER_IC_REG_EOC_POWER_CONTROL_1,
-+    POWER_IC_REG_EOC_CONN_CONTROL,
-+	POWER_IC_REG_EOC_NUM
-+};
-+
-+enum {
-+	EOC_FUNC_NOTHING,
-+	EOC_FUNC_USB_NET,
-+};
-+
-+struct ezx_eoc_platform_data {
-+	int (*init)(void);
-+};
-+
-+#endif /* __EZX_EOC_H__ */
 Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig	2007-09-09 21:46:27.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/Kconfig	2007-09-09 21:46:27.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig	2007-09-24 20:15:00.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/Kconfig	2007-09-24 20:15:16.000000000 -0300
 @@ -108,6 +108,12 @@
  config EZX_PCAP
  	bool "PCAP Support"
@@ -327,8 +282,8 @@ Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig
  	depends on EZX_PCAP
 Index: linux-2.6.21/arch/arm/mach-pxa/Makefile
 ===================================================================
---- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile	2007-09-09 21:46:27.000000000 -0300
-+++ linux-2.6.21/arch/arm/mach-pxa/Makefile	2007-09-09 21:46:27.000000000 -0300
+--- linux-2.6.21.orig/arch/arm/mach-pxa/Makefile	2007-09-24 20:15:00.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/Makefile	2007-09-24 20:15:16.000000000 -0300
 @@ -27,6 +27,7 @@
  obj-$(CONFIG_EZX_BP)		+= ezx-bp.o
  obj-$(CONFIG_EZX_PCAP)		+= ezx-pcap.o
diff --git a/packages/linux/linux-ezx-2.6.21/patches/index.html b/packages/linux/linux-ezx-2.6.21/patches/index.html
index bbbb40d590..6cd7a62548 100644
--- a/packages/linux/linux-ezx-2.6.21/patches/index.html
+++ b/packages/linux/linux-ezx-2.6.21/patches/index.html
@@ -1,10 +1,12 @@
-<html><head><title>Revision 2059: /trunk/src/kernel-2.6/patches</title></head>
+<html><head><title>Revision 2064: /trunk/src/kernel-2.6/patches</title></head>
 <body>
- <h2>Revision 2059: /trunk/src/kernel-2.6/patches</h2>
+ <h2>Revision 2064: /trunk/src/kernel-2.6/patches</h2>
  <ul>
   <li><a href="../">..</a></li>
   <li><a href="Makefile.OpenEZX">Makefile.OpenEZX</a></li>
   <li><a href="a1200-eoc.patch">a1200-eoc.patch</a></li>
+  <li><a href="a1200-flip.patch">a1200-flip.patch</a></li>
+  <li><a href="a1200-kbd.patch">a1200-kbd.patch</a></li>
   <li><a href="a1200-mci.patch">a1200-mci.patch</a></li>
   <li><a href="a1200-pcap.patch">a1200-pcap.patch</a></li>
   <li><a href="a1200-ts.patch">a1200-ts.patch</a></li>
@@ -46,7 +48,6 @@
   <li><a href="ezx-pcap.patch">ezx-pcap.patch</a></li>
   <li><a href="ezx-pm.patch">ezx-pm.patch</a></li>
   <li><a href="ezx-serial-bug-workaround.patch">ezx-serial-bug-workaround.patch</a></li>
-  <li><a href="i2c-core-fix-a1200.patch">i2c-core-fix-a1200.patch</a></li>
   <li><a href="mtdfix.patch">mtdfix.patch</a></li>
   <li><a href="mux-fix-init-errorpath.patch">mux-fix-init-errorpath.patch</a></li>
   <li><a href="mux-fix-makefile.patch">mux-fix-makefile.patch</a></li>
@@ -64,6 +65,7 @@
   <li><a href="pxa-kbd.patch">pxa-kbd.patch</a></li>
   <li><a href="pxa27x-udc-fix-a1200.patch">pxa27x-udc-fix-a1200.patch</a></li>
   <li><a href="pxa27x-udc-support.2.patch">pxa27x-udc-support.2.patch</a></li>
+  <li><a href="pxa27x_overlay-r5.patch">pxa27x_overlay-r5.patch</a></li>
   <li><a href="series">series</a></li>
  </ul>
  <hr noshade><em>Powered by <a href="http://subversion.tigris.org/">Subversion</a> version 1.1.4 (r13838).</em>
diff --git a/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch b/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch
index 9ee87ff903..1dd6edd7c3 100644
--- a/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch
+++ b/packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch
@@ -1,7 +1,8 @@
+This hack hardcodes pxa27x-udc to ether_gadget. This is just a temp workaround.
 Index: linux-2.6.21/drivers/usb/gadget/ether.c
 ===================================================================
---- linux-2.6.21.orig/drivers/usb/gadget/ether.c	2007-08-20 22:05:12.000000000 +0800
-+++ linux-2.6.21/drivers/usb/gadget/ether.c	2007-08-20 22:06:25.000000000 +0800
+--- linux-2.6.21.orig/drivers/usb/gadget/ether.c	2007-09-23 09:32:51.000000000 -0300
++++ linux-2.6.21/drivers/usb/gadget/ether.c	2007-09-23 09:32:52.000000000 -0300
 @@ -2697,10 +2697,16 @@
  MODULE_LICENSE ("GPL");
  
@@ -22,8 +23,8 @@ Index: linux-2.6.21/drivers/usb/gadget/ether.c
  static void __exit cleanup (void)
 Index: linux-2.6.21/drivers/usb/gadget/pxa27x_udc.c
 ===================================================================
---- linux-2.6.21.orig/drivers/usb/gadget/pxa27x_udc.c	2007-08-20 22:07:31.000000000 +0800
-+++ linux-2.6.21/drivers/usb/gadget/pxa27x_udc.c	2007-08-20 22:07:47.000000000 +0800
+--- linux-2.6.21.orig/drivers/usb/gadget/pxa27x_udc.c	2007-09-23 09:32:51.000000000 -0300
++++ linux-2.6.21/drivers/usb/gadget/pxa27x_udc.c	2007-09-23 09:32:52.000000000 -0300
 @@ -2227,6 +2227,8 @@
  	udc_init_ep(udc);
  	udc_reinit(udc);
diff --git a/packages/linux/linux-ezx-2.6.21/patches/series b/packages/linux/linux-ezx-2.6.21/patches/series
index aa95fcbc78..99f95a6c07 100755
--- a/packages/linux/linux-ezx-2.6.21/patches/series
+++ b/packages/linux/linux-ezx-2.6.21/patches/series
@@ -1,5 +1,6 @@
 patch-2.6.21.4
 mtdfix.patch
+pxa27x_overlay-r5.patch
 
 ezx-core.patch
 # ezx-core TODO: should be ezx-common
@@ -42,6 +43,7 @@ ezx-emu.patch
 a780-emu.patch
 e680-emu.patch
 
+pxa27x-udc-fix-a1200.patch #(see ezx-a1200.c)
 ezx-eoc.patch
 a1200-eoc.patch
 e6-eoc.patch
@@ -53,6 +55,7 @@ ezx-serial-bug-workaround.patch
 pxa-kbd.patch
 a780-kbd.patch
 e680-kbd.patch
+a1200-kbd.patch
 
 pcap-ts.patch
 a780-ts.patch
@@ -64,6 +67,7 @@ ezx-backlight.patch
 
 a780-flip.patch
 e680-locksw.patch
+a1200-flip.patch
 
 a780-leds.patch
 e680-leds.patch
@@ -97,7 +101,6 @@ ezx-asoc.patch
 #		pxa-ohci, ts0710_mux, ts0710_mux_usb, ezx-bp
 
 # the folowing break too much stuff on other phones.
-# i2c-core-fix-a1200.patch (see ezx-eoc.c)
-# pxa27x-udc-fix-a1200.patch (see ezx-a1200.c)
 
 # incomplete
+
diff --git a/packages/linux/linux-ezx-2.6.21/rokre2/defconfig b/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
index 8d0f391c08..7e22a3c371 100755
--- a/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/rokre2/defconfig
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1310,12 +1310,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=m
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
diff --git a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
index 6351d3a45b..8201825d75 100755
--- a/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
+++ b/packages/linux/linux-ezx-2.6.21/rokre6/defconfig
@@ -45,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -1003,7 +1003,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_EZX=y
+CONFIG_BACKLIGHT_EZX=N
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
@@ -1313,12 +1313,12 @@ CONFIG_RTC_DRV_SA1100=m
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS=n
 CONFIG_EXT3_FS_XATTR=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index 5d0096f2b7..db561a7f0d 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-r20"
+PR = "${EZX}-r23"
 
 require linux.inc
 
@@ -47,6 +47,7 @@ SRC_URI = " \
     file://patches/pxa-kbd.patch;patch=1 \
     file://patches/a780-kbd.patch;patch=1 \
     file://patches/e680-kbd.patch;patch=1 \
+    file://patches/a1200-kbd.patch;patch=1 \
     file://patches/pcap-ts.patch;patch=1 \
     file://patches/a780-ts.patch;patch=1 \
     file://patches/e680-ts.patch;patch=1 \
@@ -54,6 +55,7 @@ SRC_URI = " \
     file://patches/e6-ts.patch;patch=1 \
     file://patches/a780-flip.patch;patch=1 \
     file://patches/e680-locksw.patch;patch=1 \
+    file://patches/a1200-flip.patch;patch=1 \
     file://patches/a780-leds.patch;patch=1 \
     file://patches/e680-leds.patch;patch=1 \
     file://patches/a780-vibrator.patch;patch=1 \
@@ -70,15 +72,11 @@ SRC_URI = " \
     file://patches/asoc-fix-loopback.patch;patch=1 \
     file://patches/ezx-asoc.patch;patch=1 \     
     file://patches/mtdfix.patch;patch=1 \
+    file://patches/ezx-backlight.patch;patch=1 \
     file://defconfig \
     \
     "
 
-BACKLIGHTPATCH = " file://patches/ezx-backlight.patch;patch=1 "
-BACKLIGHTPATCH_rokre6 = ""
-
-SRC_URI += "${BACKLIGHTPATCH}"
-
 S = "${WORKDIR}/linux-${PV}"
 
 
@@ -94,7 +92,7 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
 #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
 CMDLINE_CON = "console=tty1 "
 
-CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5"
 CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
 # Uncomment to enable dyntick
 #CMDLINE_OTHER = "dyntick=enable"
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index b2a71a84be..47c32a4a24 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -60,8 +60,42 @@ do_deploy() {
 	# format:
 	# name file md5sumfile destination
 	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
+	gen_haret_startup
 }   
    
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_package after do_install
+
+
+gen_haret_startup() {
+	cat >${DEPLOY_DIR_IMAGE}/startup.txt <<EOF 
+# This is startup file for HaRET, Linux bootloader for WinCE
+# http://handhelds.org/wiki/HaRET
+
+set kernel "${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}"
+
+# Boot choices. Uncomment 'set' statements in exactly one section
+
+## Choice 1 - Boot from SD/MMC card
+# Have 2 partition on a card:
+# 1st - FAT with HaRET executable, this file and zImage above
+# 2nd - EXT2 with rootfs tarball extracted
+set cmdline "root=/dev/mmcblk0p2 rootdelay=10 console=ttyS0,115200n8 console=tty0"
+
+## Choice 2 - Boot from CD card, setup like above
+#set cmdline "root=/dev/hda2 rootdelay=10 console=ttyS0,115200n8 console=tty0"
+
+## Choice 3 - Boot rootfs image as initramfs (works only for smaller images)
+# have a cpio.gz file below together with zImage, no EXT2 partition required
+#set initrd "<image>.rootfs.cpio.gz"
+#set cmdline "rdinit=/sbin/init console=ttyS0,115200n8 console=tty0"
+
+## Choice 4 - Boot via NFS over USB networking (must be kernel-builtin)
+# 192.168.x.x - Server address (the other side)
+# 192.168.x.x - Handheld's address
+#set cmdline "root=/dev/nfs nfsroot=192.168.x.x:<nfs_path> ip=192.168.y.y:192.168.x.x:192.168.x.x:255.255.255.0:pda:usb0 console=ttyS0,115200n8 console=tty0"
+
+bootlinux
+EOF
+}
diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01 b/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01
index 1d12b6ec36..7aa23df77c 100644
--- a/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01
+++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta01
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.1
-# Thu Jul 26 22:01:38 2007
+# Linux kernel version: 2.6.22.5
+# Wed Oct  3 13:55:25 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -200,11 +200,12 @@ CONFIG_ARCH_S3C2440=y
 CONFIG_SMDK2440_CPU2440=y
 CONFIG_MACH_HXD8=y
 CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_CPU_S3C2442=y
 
 #
 # S3C2442 Machines
 #
-# CONFIG_SMDK2440_CPU2442 is not set
+CONFIG_SMDK2440_CPU2442=y
 
 #
 # S3C2443 Machines
@@ -282,6 +283,7 @@ CONFIG_KEXEC=y
 # At least one emulation must be selected
 #
 CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
 
 #
@@ -1196,9 +1198,6 @@ CONFIG_FONT_6x11=y
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_LOGO is not set
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
 
 #
 # Sound
@@ -1586,7 +1585,7 @@ CONFIG_CONFIGFS_FS=m
 # CONFIG_EFS_FS is not set
 CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_YAFFS1=y
-# CONFIG_YAFFS_DOES_ECC is not set
+CONFIG_YAFFS_9BYTE_TAGS=y
 CONFIG_YAFFS_YAFFS2=y
 CONFIG_YAFFS_AUTO_YAFFS2=y
 # CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02 b/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02
index 1d12b6ec36..7aa23df77c 100644
--- a/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02
+++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5-fic-gta02
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.1
-# Thu Jul 26 22:01:38 2007
+# Linux kernel version: 2.6.22.5
+# Wed Oct  3 13:55:25 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -200,11 +200,12 @@ CONFIG_ARCH_S3C2440=y
 CONFIG_SMDK2440_CPU2440=y
 CONFIG_MACH_HXD8=y
 CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_CPU_S3C2442=y
 
 #
 # S3C2442 Machines
 #
-# CONFIG_SMDK2440_CPU2442 is not set
+CONFIG_SMDK2440_CPU2442=y
 
 #
 # S3C2443 Machines
@@ -282,6 +283,7 @@ CONFIG_KEXEC=y
 # At least one emulation must be selected
 #
 CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
 # CONFIG_FPE_FASTFPE is not set
 
 #
@@ -1196,9 +1198,6 @@ CONFIG_FONT_6x11=y
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_LOGO is not set
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_LOGO_LINUX_CLUT224 is not set
 
 #
 # Sound
@@ -1586,7 +1585,7 @@ CONFIG_CONFIGFS_FS=m
 # CONFIG_EFS_FS is not set
 CONFIG_YAFFS_FS=y
 CONFIG_YAFFS_YAFFS1=y
-# CONFIG_YAFFS_DOES_ECC is not set
+CONFIG_YAFFS_9BYTE_TAGS=y
 CONFIG_YAFFS_YAFFS2=y
 CONFIG_YAFFS_AUTO_YAFFS2=y
 # CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index e4608a7565..290f475130 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -8,4 +8,4 @@ SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1"
 VANILLA_VERSION = "2.6.22.5"
 MOKOR = "moko11+svnr${SRCREV}"
 PV = "${VANILLA_VERSION}-${MOKOR}"
-PR = "r2"
+PR = "r3"
diff --git a/packages/linux/linux-rp_2.6.22.bb b/packages/linux/linux-rp_2.6.22.bb
index b36189d9fb..50ee894ee9 100644
--- a/packages/linux/linux-rp_2.6.22.bb
+++ b/packages/linux/linux-rp_2.6.22.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r9"
+PR = "r10"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -37,6 +37,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \
            ${RPSRC}/poodle_pm-r4.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
+           ${RPSRC}/w100_extmem-r1.patch;patch=1 \
            file://hostap-monitor-mode.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 7579481005..41b0c13179 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -40,7 +40,7 @@ do_configure_prepend() {
         #
         # oabi / eabi support
         #
-        if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
+        if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
                 echo "CONFIG_AEABI=y"                   >> ${S}/.config
                 echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
         else
diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb
index 0848bcd71a..2ef35ef4c0 100644
--- a/packages/linux/linux_2.6.21.bb
+++ b/packages/linux/linux_2.6.21.bb
@@ -69,7 +69,9 @@ GUMSTIX_PATCHES = "\
        file://uImage-in-own-partition.patch;patch=1 \
        file://pxa-regs-fixup.patch;patch=1 \
        file://gumstix-fb-logo.patch;patch=1 \
+       file://gumstix-pxa270-mmc.patch;patch=1 \
        file://pxafb-18bpp-mode.patch;patch=1 \
+       file://smc911x-fixup.patch;patch=1 \
        "
 
 SRC_URI_append_gumstix-verdex = "${GUMSTIX_PATCHES}"
diff --git a/packages/maemo3/hildon-1_svn.bb b/packages/maemo3/hildon-1_svn.bb
index c5c01792ca..5105472989 100644
--- a/packages/maemo3/hildon-1_svn.bb
+++ b/packages/maemo3/hildon-1_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
 
 DEPENDS = "gconf-dbus esound gtk+"
 
-PV = "1.0.12+svnr${SRCREV}"
+PV = "1.0.17+svnr${SRCREV}"
 
 SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \
            file://buttonbox.patch;patch=1 "
diff --git a/packages/maemo3/libhildonfm/.mtn2git_empty b/packages/maemo3/libhildonfm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo3/libhildonfm/.mtn2git_empty
diff --git a/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff b/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff
new file mode 100644
index 0000000000..8d91e1dd65
--- /dev/null
+++ b/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff
@@ -0,0 +1,132 @@
+--- /tmp/hildon-file-selection.c	2007-10-02 10:08:17.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-selection.c	2007-10-02 11:26:58.292045000 +0200
+@@ -2036,6 +2036,7 @@
+     g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static void hildon_file_selection_navigation_pane_context(GtkWidget *
+                                                           widget,
+                                                           gpointer data)
+@@ -2052,6 +2053,7 @@
+     ULOG_DEBUG(__FUNCTION__);
+     g_signal_emit(data, signal_content_pane_context_menu, 0);
+ }
++#endif /* USE_MAEMO_GTK */
+ 
+ static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
+                                                           widget,
+@@ -2200,6 +2202,7 @@
+   }
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static gboolean
+ tap_and_hold_query (gpointer self, guint signal_id)
+ {
+@@ -2225,6 +2228,8 @@
+   return tap_and_hold_query (self, signal_navigation_pane_context_menu);
+ }
+ 
++#endif /* USE_MAEMO_GTK */
++
+ static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
+                                                         * self)
+ {
+@@ -2277,7 +2282,7 @@
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+                                   GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2286,6 +2291,7 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
++#endif /* USE_MAEMO_GTK */
+ 
+     g_signal_connect_object(tree, "notify::has-focus",
+                      G_CALLBACK(content_pane_focus), self, 0);
+@@ -2397,7 +2403,7 @@
+         (selection, "changed",
+          G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
+          self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
+                                   GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (tree, "tap-and-hold-query",
+@@ -2406,7 +2412,7 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+@@ -2492,7 +2498,7 @@
+     g_signal_connect_object(selection, "changed",
+                      G_CALLBACK(hildon_file_selection_selection_changed),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     gtk_widget_tap_and_hold_setup(GTK_WIDGET(self->priv->dir_tree), NULL,
+                                   NULL, GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+     g_signal_connect_object (self->priv->dir_tree, "tap-and-hold-query",
+@@ -2502,7 +2508,7 @@
+                      G_CALLBACK
+                      (hildon_file_selection_navigation_pane_context),
+                      self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+     g_signal_connect_object(self->priv->dir_tree, "key-press-event",
+                      G_CALLBACK
+                      (hildon_file_selection_on_navigation_pane_key), self, 0);
+--- /tmp/hildon-file-chooser-dialog.c	2007-10-02 10:14:05.000000000 +0200
++++ 1_1.9.41/hildon-fm/hildon-file-chooser-dialog.c	2007-10-02 11:33:43.132045000 +0200
+@@ -191,7 +191,7 @@
+ 
+   return (first_digit << 4) | second_digit;
+ }
+-
++#ifdef USE_MAEMO_GTK
+ static void chooser_entry_invalid_input_cb (GtkEntry *entry,
+                                             GtkInvalidInputType inv_type,
+                                             gpointer user_data)
+@@ -202,7 +202,7 @@
+                                     HCS("ckdg_ib_maximum_characters_reached"));
+   }
+ }
+-
++#endif /* USE_MAEMO_GTK */
+ static gchar *
+ g_unescape_uri_string (const char *escaped,
+                        int         len,
+@@ -1837,8 +1837,9 @@
+                               G_PARAM_READWRITE);
+     g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+ 
+-
++#ifdef USE_MAEMO_GTK
+     hildon_gtk_file_chooser_install_properties(gobject_class);
++#endif
+ }
+ 
+ static void hildon_file_chooser_dialog_sort_changed(GtkWidget * item,
+@@ -1975,10 +1976,10 @@
+           g_signal_connect( priv->entry_name, "changed",
+                           G_CALLBACK( hildon_file_chooser_entry_changed ),
+                           self );
+-
++#ifdef USE_MAEMO_GTK
+     g_signal_connect(priv->entry_name, "invalid-input",
+                      G_CALLBACK(chooser_entry_invalid_input_cb), self);
+-
++#endif /* USE_MAEMO_GTK */
+     priv->hbox_location = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+     priv->image_location = gtk_image_new();
diff --git a/packages/maemo3/libhildonfm_1.9.41.bb b/packages/maemo3/libhildonfm_1.9.41.bb
new file mode 100644
index 0000000000..de1bb3d9e3
--- /dev/null
+++ b/packages/maemo3/libhildonfm_1.9.41.bb
@@ -0,0 +1,29 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "hildon-thumbnail mce-dev libhildonmime osso-gwconnect hildon-libs osso-thumbnail"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_${PV}.tar.gz \
+           file://hildonfm-ifdef-maemogtk.diff;patch=1 \
+	   "
+
+inherit autotools pkgconfig lib_package
+
+S = "${WORKDIR}/1_${PV}"
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+        touch gtk-doc.make
+}
+
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/maemo3/libhildonhelp_1.9.1.bb b/packages/maemo3/libhildonhelp_1.9.1.bb
index b04efe2660..43d4c15d2e 100644
--- a/packages/maemo3/libhildonhelp_1.9.1.bb
+++ b/packages/maemo3/libhildonhelp_1.9.1.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Nokia hildon help library"
 
-DEPENDS = "libart libpng jpeg libxml2 gtkhtml-3.8 libosso"
+DEPENDS = "libart-lgpl libpng jpeg libxml2 gtkhtml-3.8 libosso"
 
 PR = "r0"
 
diff --git a/packages/meta/cross-linkage_1.0.bb b/packages/meta/cross-linkage_1.0.bb
new file mode 100644
index 0000000000..2a9caca5da
--- /dev/null
+++ b/packages/meta/cross-linkage_1.0.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "cross-linkage sets up symlinks between cross and staging so the compiler can find things"
+SECTION = "devel"
+PACKAGES = ""
+
+INHIBIT_DEFAULT_DEPS = "1"
+PR = "r0"
+
+SRC_URI = ""
+
+do_configure() {
+	:
+}
+
+do_compile () {
+	:
+}
+
+do_install() {
+	:
+}
+
+do_stage () {
+	install -d ${CROSS_DIR}/${TARGET_SYS}/
+	rm -rf ${CROSS_DIR}/${TARGET_SYS}/include
+	ln -s  ${STAGING_INCDIR}/ ${CROSS_DIR}/${TARGET_SYS}/include
+	rm -rf ${CROSS_DIR}/${TARGET_SYS}/lib
+	ln -s  ${STAGING_LIBDIR} ${CROSS_DIR}/${TARGET_SYS}/lib 
+}
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 26b89ff000..6b34fc187a 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
 	binutils \
 	bison \
 	bluez-utils \
+	bluez-hcidump \
 	bogofilter \
 	boost \
 	bridge-utils \
diff --git a/packages/mono/README b/packages/mono/README
index 81e478bdb7..c3043faee3 100644
--- a/packages/mono/README
+++ b/packages/mono/README
@@ -1,10 +1,39 @@
-Mono in OE is still very much a work in progress.
-1.2.4 
-  - is reported to work on MIPS.  
-  - has floating point problems on ARM
+Notes on Mono support in OE.
+
+===============================
+Cross Compiling Mono
+
+Cross compiling mono requires a two stage build because the mono mcs directory
+cannot be built while cross compiling (http://www.mono-project.com/Mono:ARM).
+The recommended way to cross compile mono is to 
+
+ 1. do a complete build on the host system, and install.  
+ 2. cross compile mono which will only build the native target code and 
+    overlay the target binaries on the host install.  
+
+The MCS build (step 1) is implemented by the mono-mcs-intermediate* recipe.
+This recipe is very similiar to the native build, except it uses standard
+install prefixes and the install directory is tar'd up, and placed in staging
+for use by the cross build.
+
+During the mono cross build, the first step during the install is to untar
+the install results of the mcs-intermediate build.  The cross build install
+then proceeds to overlay the native binaries in the install directory.
+
+================================
+mono.bbclass
+
+Has a helper function for the list that maps file patterns to package
+names and assemblies (see below). Also has a function mono_do_clilibs
+and inserts that function into PACKAGEFUNCS. This function calls
+mono_find_provides_and_requires which finds out (through calls to
+monodis --assembly and monodis --assemblyref) which assemblies are
+provided and required by a particular package. mono_do_clilibs then
+puts the information about provided assemblies into
+${STAGING_DIR}/clilibs/${packagename}.list and information about the
+required packages into ${PKGDEST}/{packagename}.clilibdeps where it
+will later be picked up by the modified read_shlibdeps.
+
 
-1.2.5pre5
-  - tested on ARM EABI.  Floating point issues have been worked around.
 
-There is still a lot of packaging work that needs done to package the mono dll's for installation.
 
diff --git a/packages/mono/collect-paths.py b/packages/mono/collect-paths.py
new file mode 100644
index 0000000000..a49b76e5aa
--- /dev/null
+++ b/packages/mono/collect-paths.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python
+
+## This utility takes the debian directory from an unpacked debian mono source tree
+## (e.g. apt-get source mono), parses the *.install files and generates python source
+## for a list of dictionaries that describe the individual packages and their contents
+## The output will look like
+##debian_mono_file_table = [
+##        {       'name': 'libmono-peapi1.0-cil',
+##                'patterns': [
+##                                '/usr/lib/mono/gac/PEAPI/1.0.*/',
+##                                '/usr/lib/mono/1.0/PEAPI.dll'
+##                        ],
+##                'assemblies': [
+##                                ('PEAPI', '1.0.*')
+##                        ]
+##        },
+##        {       'name': 'mono-mjs',
+##                'patterns': [
+##                                '/usr/bin/mjs',
+##                                '/usr/lib/mono/1.0/mjs.exe*'
+##                        ]
+##        },
+##....
+
+
+import os, sys, re
+
+def collect_paths(dir):
+    paths = {}
+    
+    os.chdir(dir)
+    for filename in os.listdir("."):
+        if filename.endswith(".install"):
+            fp = file(filename, "r")
+            lines = fp.readlines()
+            fp.close()
+            
+            contents = []
+            for line in lines:
+                lineparts = line.strip().split()
+                if lineparts[0].startswith("debian/tmp"):
+                    pattern = lineparts[0][ len("debian/tmp"): ]
+                    if len(lineparts) == 2:
+                        if not pattern.startswith(lineparts[1]):
+                            print >>sys.stderr, "Warning: Apparently I don't fully understand the format in file %s" % filename
+                    elif len(lineparts) > 2:
+                        print >>sys.stderr, "Warning: Apparently I don't fully understand the format in file %s" % filename
+                    
+                    contents.append( pattern )
+                else:
+                    print >>sys.stderr, "Note: Ignoring %s in %s" % (lineparts, filename)
+                
+            paths[ filename[ :-len(".install") ] ] = contents
+    
+    return paths
+
+def collect_packages(paths):
+    gac_re = re.compile(r'/usr/lib/mono/gac/(?P<assembly>[^/]+)/(?P<version>[^/]+)/?')
+    
+    # These packages should be populated first (e.g. because their files will otherwise end up
+    # in other packages)
+    PACKAGES_FIRST = ("mono-jit", "mono-gac", "mono-mjs", "mono-gmcs", "mono-utils", "mono-doc")
+    # These should be populated last (because their spec is very broad)
+    PACKAGES_LAST = ("mono-mcs", "libmono-system1.0-cil", "libmono-system2.0-cil", "libmono1.0-cil", "libmono2.0-cil")
+    first = []
+    last = []
+    packages = paths.keys()
+    for packagename in PACKAGES_FIRST + PACKAGES_LAST:
+        if packagename in packages:
+            packages.remove(packagename)
+            if packagename in PACKAGES_FIRST:
+                first.append(packagename)
+            else:
+                last.append(packagename)
+    packagenames = first + packages + last
+    
+    packages = []
+    for name in packagenames:
+        patterns = paths[ name ]
+        package = { "name": name,
+            "patterns": patterns}
+        
+        provided_assemblies = []
+        for pattern in patterns:
+            match = gac_re.match(pattern)
+            if match:
+                provided_assemblies.append( (match.group("assembly"), match.group("version")) )
+            if pattern == "/usr/lib/mono/1.0/mscorlib.dll*":
+                provided_assemblies.append( ("mscorlib", "1.0.*" ) )
+            elif pattern == "/usr/lib/mono/2.0/mscorlib.dll*":
+                provided_assemblies.append( ("mscorlib", "2.0.*" ) )
+        
+        if len(provided_assemblies) > 0:
+            package["assemblies"] = provided_assemblies
+        
+        packages.append(package)
+    
+    return packages
+
+if __name__ == "__main__":
+    packages = collect_packages( collect_paths(".") )
+    
+    if False: # Human-friendly
+        for package in packages:
+            print "Package: %s" % package["name"]
+            if package.has_key("provided_assemblies"):
+                print "Provides: \t%s" % ( "\n\t\t".join( [" ".join(e) for e in package["assemblies"] ] ) )
+            print "Patterns: \t\t%s" % ( "\n\t\t\t".join(package["patterns"]) )
+            print
+    else:
+        print "# This is a generated file, please do not edit directly"
+        print "# Use collect-paths.py instead. -- Henryk <henryk@openmoko.org>"
+        print "debian_mono_file_table = ["
+        print ",\n".join( 
+            [ 
+                "\t{\t%s\n\t}" % ",\n\t\t".join( 
+                    [
+                        "%r: %r" % (key, value)
+                        for key, value in package.items()
+                        if not isinstance(value, (list,tuple))
+                    ] + [
+                        "%r: [\n\t\t\t\t%s\n\t\t\t]" % (key, ",\n\t\t\t\t".join( [
+                                "%r"%(e,) for e in value
+                            ])
+                        )
+                        for key, value in package.items()
+                        if isinstance(value, (list,tuple))
+                    ]
+
+                )
+                for package in packages 
+            ]
+        )
+        print "]"
+    
diff --git a/packages/mono/files/genmdesc-cpp.patch b/packages/mono/files/genmdesc-cpp.patch
new file mode 100644
index 0000000000..56eca8effd
--- /dev/null
+++ b/packages/mono/files/genmdesc-cpp.patch
@@ -0,0 +1,22 @@
+--- mono-1.2.5.1/mono/mini/genmdesc.pl.orig	2007-10-03 21:02:07.000000000 +0200
++++ mono-1.2.5.1/mono/mini/genmdesc.pl	2007-10-03 21:06:16.000000000 +0200
+@@ -36,7 +36,9 @@
+ 		$i++;
+ 	}
+ 	close (OPS);
+-	my $cpp = "cpp -undef ";
++	my $cpp = $ENV{"CPP"};
++	$cpp = "cpp" unless defined $cpp;
++	$cpp .= " -undef ";
+ 	foreach (@defines) {
+ 		$cpp .= " -U$_";
+ 		$arch_found = 1 if $arch eq $_;
+@@ -44,7 +46,7 @@
+ 	die "$arch arch is not supported.\n" unless $arch_found;
+ 
+ 	$cpp .= " -D$arch $srcdir/mini-ops.h|";
+-	#print "Running: $cpp\n";
++	print "Running: $cpp\n";
+ 	open (OPS, $cpp) || die "Cannot execute cpp: $!";
+ 	while (<OPS>) {
+ 		next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/;
diff --git a/packages/mono/files/mono-fix-libdir-path.patch b/packages/mono/files/mono-fix-libdir-path.patch
new file mode 100644
index 0000000000..9255117bf8
--- /dev/null
+++ b/packages/mono/files/mono-fix-libdir-path.patch
@@ -0,0 +1,11 @@
+--- mono-1.2.5/scripts/Makefile.am.orig	2007-09-27 04:23:39.000000000 +0200
++++ mono-1.2.5/scripts/Makefile.am	2007-09-27 04:24:19.000000000 +0200
+@@ -92,7 +92,7 @@
+ mono_instdir = $(shell cygpath -m $(libdir))/mono
+ else
+ plat_bindir = $(bindir)
+-mono_instdir = $(prefix)/lib/mono
++mono_instdir = $(libdir)/mono
+ endif
+ 
+ REWRITE_COMMON = sed \
diff --git a/packages/mono/mono-1.2.5.1/.mtn2git_empty b/packages/mono/mono-1.2.5.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mono/mono-1.2.5.1/.mtn2git_empty
diff --git a/packages/mono/mono-1.2.5/configure.patch b/packages/mono/mono-1.2.5.1/configure.patch
index 1553115c0e..1553115c0e 100644
--- a/packages/mono/mono-1.2.5/configure.patch
+++ b/packages/mono/mono-1.2.5.1/configure.patch
diff --git a/packages/mono/mono-mcs-intermediate_1.2.5.1.bb b/packages/mono/mono-mcs-intermediate_1.2.5.1.bb
new file mode 100644
index 0000000000..813da24ddf
--- /dev/null
+++ b/packages/mono/mono-mcs-intermediate_1.2.5.1.bb
@@ -0,0 +1,61 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_1.2.5.inc
+PR = "r0"
+DEPENDS = "mono-native glib-2.0-native perl-native"
+
+PARALLEL_MAKE = ""
+
+SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
+
+# Inherit native to set up compiler and paths ...
+inherit native
+# ... but override the target prefix
+prefix = "/usr"
+exec_prefix = "/usr"
+sysconfdir = "/etc"
+# TODO: Where does the mono package get
+# these paths from? Use the same source.
+
+do_fix_libtool_name() {
+	# inherit native will make that all native tools that are being
+	# built are prefixed with something like "i686-linux-",
+	# including libtool. Fix up some hardcoded libtool names:
+	for i in "${S}"/runtime/*-wrapper.in; do
+		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
+	done
+}
+addtask fix_libtool_name after do_patch before do_configure
+
+do_stage() {
+	true
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+}
+
+do_package() {
+	true
+}
+
+do_populate_staging() {
+	cd ${D}
+	rm -f ${WORKDIR}/mono-mcs-${PV}.tar.gz
+	tar -cvzf ${WORKDIR}/mono-mcs-${PV}.tar.gz .
+	install -d ${STAGING_DIR}/share/mono-mcs
+	cp ${WORKDIR}/mono-mcs-${PV}.tar.gz ${STAGING_DIR}/share/mono-mcs/
+}
+
+do_package_write_ipk() {
+	true
+}
+
+do_package_write() {
+	true
+}
diff --git a/packages/mono/mono-native_1.2.2.1.bb b/packages/mono/mono-native_1.2.2.1.bb
deleted file mode 100644
index 67651ae565..0000000000
--- a/packages/mono/mono-native_1.2.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require mono.inc
-
-DEPENDS = "glib-2.0-native"
-
-inherit native
diff --git a/packages/mono/mono-native_1.2.4.bb b/packages/mono/mono-native_1.2.4.bb
deleted file mode 100644
index 9043ccc801..0000000000
--- a/packages/mono/mono-native_1.2.4.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require mono_1.2.4.inc
-PR = "r2"
-DEPENDS = "glib-2.0-native"
-
-inherit native
-
-do_stage_prepend() {
-	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-}
diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb
new file mode 100644
index 0000000000..7ac2246b3a
--- /dev/null
+++ b/packages/mono/mono-native_1.2.5.1.bb
@@ -0,0 +1,23 @@
+require mono_1.2.5.inc
+PR = "r1"
+DEPENDS = "glib-2.0-native perl-native"
+
+SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
+
+PARALLEL_MAKE = ""
+
+inherit native
+
+#do_stage_prepend() {
+#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+#}
+
+do_fix_libtool_name() {
+	# inherit native will make that all native tools that are being
+	# built are prefixed with something like "i686-linux-",
+	# including libtool. Fix up some hardcoded libtool names:
+	for i in "${S}"/runtime/*-wrapper.in; do
+		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
+	done
+}
+addtask fix_libtool_name after do_patch before do_configure
diff --git a/packages/mono/mono-native_1.2.5.bb b/packages/mono/mono-native_1.2.5.bb
deleted file mode 100644
index 0f1391cd25..0000000000
--- a/packages/mono/mono-native_1.2.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require mono_1.2.5.inc
-PR = "r2"
-DEPENDS = "glib-2.0-native"
-
-inherit native
-
-#do_stage_prepend() {
-#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-#}
-
diff --git a/packages/mono/mono.inc b/packages/mono/mono.inc
deleted file mode 100644
index 444427ea4a..0000000000
--- a/packages/mono/mono.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
-
-SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.gz \
-           file://cpu-arm.h"
-
-S = "${WORKDIR}/mono-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-mcs-build"
-EXTRA_OECONF_arm = "--without-tls"
-
-do_compile_prepend() {
-        cp ${WORKDIR}/cpu-arm.h ${S}/mono/mini/
-}
diff --git a/packages/mono/mono_1.2.2.1.bb b/packages/mono/mono_1.2.2.1.bb
deleted file mode 100644
index 7d7134e2b2..0000000000
--- a/packages/mono/mono_1.2.2.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require mono.inc
-DEPENDS = "mono-native glib-2.0"
-
-PR = "r1"
-
-#We only have a cpu-${arch}.h from arm, so let's mask out non-working architectures
-COMPATIBLE_HOST = "arm.*-linux"
-
-do_install_append() {
-	install -d ${D}${libdir}/mono/1.0/
-	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
-}
-
-PACKAGES =+ "mono-dll"
-FILES_mono-dll = "${libdir}/mono/1.0/"
-
-
diff --git a/packages/mono/mono_1.2.4.bb b/packages/mono/mono_1.2.4.bb
deleted file mode 100644
index 13cb463129..0000000000
--- a/packages/mono/mono_1.2.4.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require mono_1.2.4.inc
-DEPENDS = "mono-native glib-2.0"
-
-PR = "r3"
-SRC_URI += "file://mono-monoburg-Makefile.patch;patch=1 \
-	    file://mono-mips-endian.patch;patch=1 \
-	    file://mono-configure.patch;patch=1 \
-	    file://mono-mini-Makefile.patch;patch=1 \
-	    "
-
-do_install_append() {
-	install -d ${D}${libdir}/mono/1.0/
-	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
-}
-
-PACKAGES =+ "mono-dll"
-FILES_mono-dll = "${libdir}/mono/1.0/"
-
-
diff --git a/packages/mono/mono_1.2.4.inc b/packages/mono/mono_1.2.4.inc
deleted file mode 100644
index b9a721150f..0000000000
--- a/packages/mono/mono_1.2.4.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Mono Programming Language"
-SECTION = "devel/mono"
-LICENSE = "GPL LGPL X11"
-
-SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2"
-
-S = "${WORKDIR}/mono-${PV}"
-
-inherit autotools
-EXTRA_OECONF = "--disable-mcs-build"
-EXTRA_OECONF_arm = "--without-tls"
-EXTRA_OECONF_mipsel = "--without-tls"
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
new file mode 100644
index 0000000000..c3ea1818ad
--- /dev/null
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -0,0 +1,146 @@
+require mono_1.2.5.inc
+
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
+
+PR = "r2"
+
+SRC_URI += "file://configure.patch;patch=1 \
+	file://genmdesc-cpp.patch;patch=1"
+
+# Per http://www.mono-project.com/Mono:ARM
+EXTRA_OECONF += " --disable-mcs-build "
+# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
+
+do_install_prepend() {
+	install -d ${D}
+	pushd ${D}
+	tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz
+	popd
+}
+
+do_install_append() {
+	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
+	# however, jay is not being cross-compiled and thus only
+	# available for the buildhost architecture, so remove it
+	# entirely
+	pushd ${D}
+	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
+	    ./usr/share/jay/README.jay \
+	    ./usr/bin/jay
+	popd
+
+	# Not packaged with the default rules and apparently
+	# not used for anything
+	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+}
+
+inherit mono
+PACKAGES = "${@" ".join([e["name"] for e in mono_get_file_table(bb.data.getVar('PV', d, 1), d) if e.has_key("name")])}"
+
+FILES_mono-doc_append = " /usr/share/libgc-mono/ "
+
+FILES_mono = "" # Apparently this gets ignored, so I'm setting it again below
+ALLOW_EMPTY_mono = "1"
+RDEPENDS_mono = "mono-common mono-jit"
+
+FILES_mono-runtime = ""
+ALLOW_EMPTY_mono-runtime = "1"
+RDEPENDS_mono-runtime = "mono-jit mono-gac"
+
+RDEPENDS_mono-jit = "mono-common"
+
+FILES_libmono-dev = "/usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
+	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
+FILES_libmono-dbg = "/usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
+	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
+
+python populate_packages_prepend () {
+	def fillin_packages():
+		# A lot of this code can probably be replaced with less code and some
+		# calls to do_split_packages
+		import bb, sys, os, glob, commands
+		
+		PV = bb.data.getVar('PV', d, 1)
+		
+		file_table = mono_get_file_table(PV, d)
+		packages_to_add = []
+		
+		D = bb.data.getVar('D', d, 1)
+		if not D: return
+		D = D + "/"
+		
+		def classify_files(files):
+			normal, dev, dbg, doc = [], [], [], []
+			for filename in files:
+				if filename.endswith(".mdb"):
+					dbg.append(filename)
+				elif os.path.basename( os.path.dirname( filename ) ) == ".debug":
+					dbg.append(filename)
+				elif filename.endswith(".pc"):
+					dev.append(filename)
+				else:
+					normal.append(filename)
+			return normal, dev, dbg, doc
+		
+		def will_strip(filename):
+			# From package.bbclass function runstrip
+			pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, 1)
+			ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, filename))
+			if "not stripped" in result:
+				return True
+			else:
+				return False
+
+		def append(name, value):
+			oldvalue = bb.data.getVar(name, d, 1) or ""
+			newvalue = " ".join([oldvalue, value])
+			bb.data.setVar(name, newvalue, d)
+		
+		already_covered = []
+		for package in file_table:
+			pn = package["name"]
+			if package.has_key("patterns"):
+				files = []
+				for pattern in package["patterns"]:
+					matching = glob.glob( D + pattern )
+					for filename in matching:
+						if os.path.isdir(filename):
+							for dirpath, dirnames, filenames in os.walk(filename):
+								for f in filenames:
+									debugname = os.path.join(dirpath, ".debug", f)
+									fullname =  os.path.join(dirpath, f)
+									files.append(fullname)
+									if will_strip(fullname):
+										files.append(debugname)
+						else:
+						    files.append(filename)
+				
+				# Remove the D prefix
+				files = [ e[len(D):] for e in files ]
+				
+				# Remove files that have already been placed in other packages
+				files = [ e for e in files if not e in already_covered ]
+				already_covered.extend( files )
+				
+				if pn.endswith("-dev") or pn.endswith("-dbg") or pn.endswith("-doc"):
+					normal, dev, dbg, doc = files, [], [], []
+				else:
+					normal, dev, dbg, doc = classify_files(files)
+				
+				for extension, filelist in [ ("",normal), ("-dev", dev), ("-dbg", dbg), ("-doc", doc)]:
+					if len(filelist) > 0:
+						packagename = pn + extension
+						append("FILES_%s" % packagename, " ".join(filelist))
+						bb.debug(2, "%s\n\t%s" %( packagename, "\n\t".join( filelist ) ))
+						if not packagename in packages_to_add:
+							packages_to_add.append(packagename)
+				
+			else:
+				packages_to_add.append(pn)
+		
+		# mono is just a stub package
+		bb.data.setVar("FILES_mono", "", d)
+		
+		bb.data.setVar("PACKAGES", " ".join(packages_to_add), d)
+	fillin_packages()
+}
diff --git a/packages/mono/mono_1.2.5.bb b/packages/mono/mono_1.2.5.bb
deleted file mode 100644
index c0a4cfb223..0000000000
--- a/packages/mono/mono_1.2.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require mono_1.2.5.inc
-
-#DEPENDS = "mono-native glib-2.0"
-# for now, we skip the mono-native build -- just install
-# mono using your distro package manager for now
-# after we get the target version working, we'll worry
-# about the native package for systems that don't have mono
-# installed
-DEPENDS = "glib-2.0"
-
-PR = "r0"
-
-SRC_URI += "file://configure.patch;patch=1"
-
-do_install_append() {
-	install -d ${D}${libdir}/mono/1.0/
-	cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/
-}
-
-PACKAGES =+ "mono-dll"
-FILES_mono-dll = "${libdir}/mono/1.0/"
-
-
diff --git a/packages/mono/mono_1.2.5.inc b/packages/mono/mono_1.2.5.inc
index 0e0df1caf2..aeca713d6b 100644
--- a/packages/mono/mono_1.2.5.inc
+++ b/packages/mono/mono_1.2.5.inc
@@ -2,15 +2,11 @@ DESCRIPTION = "Mono Programming Language"
 SECTION = "devel/mono"
 LICENSE = "GPL LGPL X11"
 
-# the md5 sum check is required because Novell does not version their pre release versions of mono
-# if the md5sum check fails, contact cbrake on #oe
-# checksums are stored in conf/checksums.ini
-SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.5.tar.bz2"
+SRC_URI = "http://go-mono.com/sources/mono/mono-${PV}.tar.bz2"
 
-S = "${WORKDIR}/mono-1.2.5"
+S = "${WORKDIR}/mono-${PV}"
 
 inherit autotools
-EXTRA_OECONF = "--disable-mcs-build"
 EXTRA_OECONF_arm = "--without-tls"
 EXTRA_OECONF_mipsel = "--without-tls"
 
diff --git a/packages/mono/mono_files.py b/packages/mono/mono_files.py
new file mode 100644
index 0000000000..6e673743c3
--- /dev/null
+++ b/packages/mono/mono_files.py
@@ -0,0 +1,605 @@
+# This is a generated file, please do not edit directly
+# Use collect-paths.py instead. -- Henryk <henryk@openmoko.org>
+debian_mono_file_table = [
+	{	'name': 'mono-jit',
+		'patterns': [
+				'/usr/bin/mono'
+			]
+	},
+	{	'name': 'mono-gac',
+		'patterns': [
+				'/usr/bin/gacutil',
+				'/usr/lib/mono/1.0/gacutil.exe'
+			]
+	},
+	{	'name': 'mono-mjs',
+		'patterns': [
+				'/usr/bin/mjs',
+				'/usr/lib/mono/1.0/mjs.exe*'
+			]
+	},
+	{	'name': 'mono-gmcs',
+		'patterns': [
+				'/usr/bin/gmcs',
+				'/usr/bin/wsdl2',
+				'/usr/bin/monop2',
+				'/usr/bin/ilasm2',
+				'/usr/bin/resgen2',
+				'/usr/bin/mono-api-info2',
+				'/usr/bin/mono-service2',
+				'/usr/bin/mkbundle2',
+				'/usr/bin/xbuild',
+				'/usr/bin/sgen',
+				'/usr/bin/al2',
+				'/usr/bin/httpcfg',
+				'/usr/lib/mono/2.0/*.exe*',
+				'/usr/lib/mono/2.0/xbuild.rsp',
+				'/usr/lib/mono/2.0/MSBuild/',
+				'/usr/lib/mono/2.0/Microsoft.Build.xsd',
+				'/usr/lib/mono/2.0/Microsoft.CSharp.targets',
+				'/usr/lib/mono/2.0/Microsoft.Common.tasks',
+				'/usr/lib/mono/2.0/Microsoft.Common.targets',
+				'/usr/lib/mono/2.0/Microsoft.VisualBasic.targets'
+			]
+	},
+	{	'name': 'mono-utils',
+		'patterns': [
+				'/usr/bin/pedump',
+				'/usr/bin/monodis',
+				'/usr/bin/monograph',
+				'/usr/bin/mono-find-provides',
+				'/usr/bin/mono-find-requires'
+			]
+	},
+	{	'name': 'libmono-peapi1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/PEAPI/1.0.*/',
+				'/usr/lib/mono/1.0/PEAPI.dll'
+			],
+		'assemblies': [
+				('PEAPI', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-cairo1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Cairo/1.0.*/',
+				'/usr/lib/mono/1.0/Mono.Cairo.dll',
+				'/usr/lib/pkgconfig/mono-cairo.pc'
+			],
+		'assemblies': [
+				('Mono.Cairo', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-system-web2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Web/2.0.*/',
+				'/usr/lib/mono/gac/System.Web.Services/2.0.*/',
+				'/usr/lib/mono/2.0/System.Web.dll',
+				'/usr/lib/mono/2.0/System.Web.Services.dll'
+			],
+		'assemblies': [
+				('System.Web', '2.0.*'),
+				('System.Web.Services', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-accessibility2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Accessibility/2.0.*/',
+				'/usr/lib/mono/2.0/Accessibility.dll'
+			],
+		'assemblies': [
+				('Accessibility', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-microsoft7.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Microsoft.JScript/7.0.*/',
+				'/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/',
+				'/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/',
+				'/usr/lib/mono/1.0/Microsoft.JScript.dll',
+				'/usr/lib/mono/1.0/Microsoft.VisualC.dll',
+				'/usr/lib/mono/1.0/Microsoft.Vsa.dll'
+			],
+		'assemblies': [
+				('Microsoft.JScript', '7.0.*'),
+				('Microsoft.VisualC', '7.0.*'),
+				('Microsoft.Vsa', '7.0.*')
+			]
+	},
+	{	'name': 'libmono-winforms2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Windows.Forms/2.0.*/',
+				'/usr/lib/mono/gac/System.Drawing.Design/2.0.*/',
+				'/usr/lib/mono/gac/System.Design/2.0.*/',
+				'/usr/lib/mono/2.0/System.Windows.Forms.dll',
+				'/usr/lib/mono/2.0/System.Drawing.Design.dll',
+				'/usr/lib/mono/2.0/System.Design.dll'
+			],
+		'assemblies': [
+				('System.Windows.Forms', '2.0.*'),
+				('System.Drawing.Design', '2.0.*'),
+				('System.Design', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-ldap1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/',
+				'/usr/lib/mono/1.0/Novell.Directory.Ldap.dll'
+			],
+		'assemblies': [
+				('Novell.Directory.Ldap', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-sharpzip2.84-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/',
+				'/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll'
+			],
+		'assemblies': [
+				('ICSharpCode.SharpZipLib', '2.84.*')
+			]
+	},
+	{	'name': 'libmono-system-data2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Data/2.0.*/',
+				'/usr/lib/mono/2.0/System.Data.dll'
+			],
+		'assemblies': [
+				('System.Data', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-corlib2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/I18N*/2.0.*/',
+				'/usr/lib/mono/2.0/I18N*.dll',
+				'/usr/lib/mono/2.0/mscorlib.dll*'
+			],
+		'assemblies': [
+				('I18N*', '2.0.*'),
+				('mscorlib', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-winforms1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Windows.Forms/1.0.*/',
+				'/usr/lib/mono/gac/System.Drawing.Design/1.0.*/',
+				'/usr/lib/mono/gac/System.Design/1.0.*/',
+				'/usr/lib/mono/1.0/System.Windows.Forms.dll',
+				'/usr/lib/mono/1.0/System.Drawing.Design.dll',
+				'/usr/lib/mono/1.0/System.Design.dll'
+			],
+		'assemblies': [
+				('System.Windows.Forms', '1.0.*'),
+				('System.Drawing.Design', '1.0.*'),
+				('System.Design', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-microsoft8.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Microsoft.JScript/8.0.*/',
+				'/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/',
+				'/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/',
+				'/usr/lib/mono/2.0/Microsoft.JScript.dll',
+				'/usr/lib/mono/2.0/Microsoft.VisualC.dll',
+				'/usr/lib/mono/2.0/Microsoft.Vsa.dll'
+			],
+		'assemblies': [
+				('Microsoft.JScript', '8.0.*'),
+				('Microsoft.VisualC', '8.0.*'),
+				('Microsoft.Vsa', '8.0.*')
+			]
+	},
+	{	'name': 'libmono-corlib1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/I18N*/1.0.*/',
+				'/usr/lib/mono/1.0/I18N*.dll',
+				'/usr/lib/mono/1.0/mscorlib.dll*'
+			],
+		'assemblies': [
+				('I18N*', '1.0.*'),
+				('mscorlib', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-system-web1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Web/1.0.*/',
+				'/usr/lib/mono/gac/System.Web.Services/1.0.*/',
+				'/usr/lib/mono/1.0/System.Web.dll',
+				'/usr/lib/mono/1.0/System.Web.Services.dll'
+			],
+		'assemblies': [
+				('System.Web', '1.0.*'),
+				('System.Web.Services', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-system-runtime2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Runtime.*/2.0.*/',
+				'/usr/lib/mono/2.0/System.Runtime.*.dll'
+			],
+		'assemblies': [
+				('System.Runtime.*', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-cscompmgd8.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/cscompmgd/8.0.*/',
+				'/usr/lib/mono/2.0/cscompmgd.dll'
+			],
+		'assemblies': [
+				('cscompmgd', '8.0.*')
+			]
+	},
+	{	'name': 'libmono-cscompmgd7.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/cscompmgd/7.0.*/',
+				'/usr/lib/mono/1.0/cscompmgd.dll'
+			],
+		'assemblies': [
+				('cscompmgd', '7.0.*')
+			]
+	},
+	{	'name': 'libmono-firebirdsql1.7-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/',
+				'/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll'
+			],
+		'assemblies': [
+				('FirebirdSql.Data.Firebird', '1.7.*')
+			]
+	},
+	{	'name': 'mono-jay',
+		'patterns': [
+				'/usr/bin/jay'
+			]
+	},
+	{	'name': 'libmono-data-tds1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/',
+				'/usr/lib/mono/1.0/Mono.Data.Tds.dll'
+			],
+		'assemblies': [
+				('Mono.Data.Tds', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-sqlite1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/',
+				'/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/',
+				'/usr/lib/mono/1.0/Mono.Data.Sqlite.dll',
+				'/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll'
+			],
+		'assemblies': [
+				('Mono.Data.Sqlite', '1.0.*'),
+				('Mono.Data.SqliteClient', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-relaxng1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/',
+				'/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll'
+			],
+		'assemblies': [
+				('Commons.Xml.Relaxng', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-dev',
+		'patterns': [
+				'/usr/lib/libmono*.a',
+				'/usr/lib/libMono*.a',
+				'/usr/lib/libmono*.so',
+				'/usr/lib/libMonoSupportW.a',
+				'/usr/lib/pkgconfig/mono.pc',
+				'/usr/lib/pkgconfig/dotnet.pc',
+				'/usr/include/'
+			]
+	},
+	{	'name': 'libmono-accessibility1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Accessibility/1.0.*/',
+				'/usr/lib/mono/1.0/Accessibility.dll'
+			],
+		'assemblies': [
+				('Accessibility', '1.0.*')
+			]
+	},
+	{	'name': 'mono-common',
+		'patterns': [
+				'/etc/mono',
+				'/usr/share/mono-1.0/mono/cil/cil-opcodes.xml'
+			]
+	},
+	{	'name': 'libmono-oracle1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/',
+				'/usr/lib/mono/1.0/System.Data.OracleClient.dll'
+			],
+		'assemblies': [
+				('System.Data.OracleClient', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-system-data1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Data/1.0.*/',
+				'/usr/lib/mono/1.0/System.Data.dll'
+			],
+		'assemblies': [
+				('System.Data', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-bytefx0.7.6.2-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/',
+				'/usr/lib/mono/2.0/ByteFX.Data.dll'
+			],
+		'assemblies': [
+				('ByteFX.Data', '0.7.6.2*')
+			]
+	},
+	{	'name': 'libmono0',
+		'patterns': [
+				'/usr/lib/libmono*.so.*',
+				'/usr/lib/libMonoPosixHelper.so',
+				'/usr/lib/libMonoSupportW.so'
+			]
+	},
+	{	'name': 'libmono-sharpzip0.6-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/',
+				'/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll'
+			],
+		'assemblies': [
+				('ICSharpCode.SharpZipLib', '0.6.*')
+			]
+	},
+	{	'name': 'libmono-data-tds2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/',
+				'/usr/lib/mono/2.0/Mono.Data.Tds.dll'
+			],
+		'assemblies': [
+				('Mono.Data.Tds', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-system-messaging1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Messaging/1.0.*/',
+				'/usr/lib/mono/1.0/System.Messaging.dll'
+			],
+		'assemblies': [
+				('System.Messaging', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-npgsql1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Npgsql/1.0.*/',
+				'/usr/lib/mono/1.0/Npgsql.dll'
+			],
+		'assemblies': [
+				('Npgsql', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-security2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Security/2.0.*/',
+				'/usr/lib/mono/2.0/Mono.Security.dll'
+			],
+		'assemblies': [
+				('Mono.Security', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-security1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Security/1.0.*/',
+				'/usr/lib/mono/1.0/Mono.Security.dll'
+			],
+		'assemblies': [
+				('Mono.Security', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-bytefx0.7.6.1-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/',
+				'/usr/lib/mono/1.0/ByteFX.Data.dll'
+			],
+		'assemblies': [
+				('ByteFX.Data', '0.7.6.1*')
+			]
+	},
+	{	'name': 'libmono-microsoft-build2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/',
+				'/usr/lib/mono/2.0/Microsoft.Build.*.dll'
+			],
+		'assemblies': [
+				('Microsoft.Build.*', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-system-ldap1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.DirectoryServices/1.0.*/',
+				'/usr/lib/mono/1.0/System.DirectoryServices.dll'
+			],
+		'assemblies': [
+				('System.DirectoryServices', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-relaxng2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/',
+				'/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll'
+			],
+		'assemblies': [
+				('Commons.Xml.Relaxng', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-system-ldap2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.DirectoryServices/2.0.*/',
+				'/usr/lib/mono/2.0/System.DirectoryServices.dll'
+			],
+		'assemblies': [
+				('System.DirectoryServices', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-system-messaging2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Messaging/2.0.*/',
+				'/usr/lib/mono/2.0/System.Messaging.dll'
+			],
+		'assemblies': [
+				('System.Messaging', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-sharpzip0.84-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/',
+				'/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll'
+			],
+		'assemblies': [
+				('ICSharpCode.SharpZipLib', '0.84.*')
+			]
+	},
+	{	'name': 'libmono-sqlite2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/',
+				'/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/',
+				'/usr/lib/mono/2.0/Mono.Data.Sqlite.dll',
+				'/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll'
+			],
+		'assemblies': [
+				('Mono.Data.Sqlite', '2.0.*'),
+				('Mono.Data.SqliteClient', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-ldap2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/',
+				'/usr/lib/mono/2.0/Novell.Directory.Ldap.dll'
+			],
+		'assemblies': [
+				('Novell.Directory.Ldap', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-npgsql2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Npgsql/2.0.*/',
+				'/usr/lib/mono/2.0/Npgsql.dll'
+			],
+		'assemblies': [
+				('Npgsql', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-system-runtime1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Runtime.*/1.0.*/',
+				'/usr/lib/mono/1.0/System.Runtime.*.dll'
+			],
+		'assemblies': [
+				('System.Runtime.*', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-oracle2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/',
+				'/usr/lib/mono/2.0/System.Data.OracleClient.dll'
+			],
+		'assemblies': [
+				('System.Data.OracleClient', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-c5-1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.C5/1.0.*/',
+				'/usr/lib/mono/2.0/Mono.C5.dll'
+			],
+		'assemblies': [
+				('Mono.C5', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-sharpzip2.6-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/',
+				'/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll'
+			],
+		'assemblies': [
+				('ICSharpCode.SharpZipLib', '2.6.*')
+			]
+	},
+	{	'name': 'libmono-cairo2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.Cairo/2.0.*/',
+				'/usr/lib/mono/2.0/Mono.Cairo.dll'
+			],
+		'assemblies': [
+				('Mono.Cairo', '2.0.*')
+			]
+	},
+	{	'name': 'libmono-peapi2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/PEAPI/2.0.*/',
+				'/usr/lib/mono/2.0/PEAPI.dll'
+			],
+		'assemblies': [
+				('PEAPI', '2.0.*')
+			]
+	},
+	{	'name': 'mono-mcs',
+		'patterns': [
+				'/usr/bin/',
+				'/usr/lib/mono/1.0/*.exe*'
+			]
+	},
+	{	'name': 'libmono-system1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System*/1.0.*/',
+				'/usr/lib/mono/gac/CustomMarshalers/1.0.*/',
+				'/usr/lib/mono/1.0/System*.dll',
+				'/usr/lib/mono/1.0/CustomMarshalers.dll*'
+			],
+		'assemblies': [
+				('System*', '1.0.*'),
+				('CustomMarshalers', '1.0.*')
+			]
+	},
+	{	'name': 'libmono-system2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/System*/2.0.*/',
+				'/usr/lib/mono/gac/CustomMarshalers/2.0.*/',
+				'/usr/lib/mono/2.0/System*.dll',
+				'/usr/lib/mono/2.0/CustomMarshalers.dll*'
+			],
+		'assemblies': [
+				('System*', '2.0.*'),
+				('CustomMarshalers', '2.0.*')
+			]
+	},
+	{	'name': 'libmono1.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.*/1.0.*/',
+				'/usr/lib/mono/gac/OpenSystem.C/1.0.*',
+				'/usr/lib/mono/gac/mono-service/1.0.*/',
+				'/usr/lib/mono/1.0/Mono.*.dll',
+				'/usr/lib/mono/1.0/OpenSystem.C.dll'
+			],
+		'assemblies': [
+				('Mono.*', '1.0.*'),
+				('OpenSystem.C', '1.0.*'),
+				('mono-service', '1.0.*')
+			]
+	},
+	{	'name': 'libmono2.0-cil',
+		'patterns': [
+				'/usr/lib/mono/gac/Mono.*/2.0.*/',
+				'/usr/lib/mono/gac/OpenSystem.C/2.0.*',
+				'/usr/lib/mono/gac/mono-service/2.0.*/',
+				'/usr/lib/mono/2.0/Mono.*.dll',
+				'/usr/lib/mono/2.0/OpenSystem.C.dll'
+			],
+		'assemblies': [
+				('Mono.*', '2.0.*'),
+				('OpenSystem.C', '2.0.*'),
+				('mono-service', '2.0.*')
+			]
+	}
+]
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
index 995ed763ff..bd2bc96b52 100644
--- a/packages/mplayer/mplayer_svn.bb
+++ b/packages/mplayer/mplayer_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player."
 SECTION = "multimedia"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"
+DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11"
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
 SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
@@ -40,9 +40,6 @@ DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""
 
-DEPENDS_append_c7x0 = " sharp-aticore-oss libw100 "
-DEPENDS_append_hx4700 = " libw100 "
-
 S = "${WORKDIR}/trunk"
 
 PACKAGES =+ "mencoder"
@@ -176,33 +173,15 @@ EXTRA_OECONF_append_arm = " --disable-decoder=vorbis_decoder \
 
 EXTRA_OECONF_append_progear = " --disable-sse --disable-3dnow --disable-mmxext --disable-sse2"
 
-#enable support for the ati imageon series (w100 and w3220)
-EXTRA_OECONF_append_c7x0 = " --enable-w100 --enable-imageon "
-EXTRA_OECONF_append_hx4700 = " --enable-imageon "
-
-#enable pxa270 overlay support
-EXTRA_OECONF_append_spitz = " --enable-pxa --enable-iwmmxt "
-EXTRA_OECONF_append_akita = " --enable-pxa --enable-iwmmxt "
-EXTRA_OECONF_append_a780 = " --enable-pxa --enable-iwmmxt"
-EXTRA_OECONF_append_magician = " --enable-pxa --enable-iwmmxt"
-EXTRA_OECONF_append_htcuniversal = " --enable-pxa --enable-iwmmxt"
-EXTRA_OECONF_append_palmld = " --enable-pxa --enable-iwmmxt"
-
-#build with support for the iwmmxt instruction support (pxa270 and up)
-TARGET_CC_ARCH_spitz = "-march=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH_spitz = "iwmmxt"
-TARGET_CC_ARCH_akita = "-march=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH_akita = "iwmmxt"
-TARGET_CC_ARCH_a780 = "-march=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH_a780 = "iwmmxt"
-TARGET_CC_ARCH_hx4700 = "-march=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH_hx4700 = "iwmmxt"
-TARGET_CC_ARCH_magician = "-march=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH_magician = "iwmmxt"
-TARGET_CC_ARCH_htcuniversal = "-march=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH_htcuniversal = "iwmmxt"
-TARGET_CC_ARCH_palmld = "-march=iwmmxt -mtune=iwmmxt"
-PACKAGE_ARCH_palmld = "iwmmxt"
+#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
+#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt 
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"
+
+MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
+TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
+
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
 
 do_configure() {
 	cp ${WORKDIR}/vo_w100.c ${S}/libvo
diff --git a/packages/mtd/mtd-utils-tests_1.0.0+git.bb b/packages/mtd/mtd-utils-tests_1.0.0+git.bb
new file mode 100644
index 0000000000..b5240009a7
--- /dev/null
+++ b/packages/mtd/mtd-utils-tests_1.0.0+git.bb
@@ -0,0 +1,59 @@
+require mtd-utils_1.0.0+git.bb
+
+# this can probably be integrated into the main mtd-utils package
+# but I did not want to risk breakage -- but would be glad to 
+# integrate them if that is best -- cbrake
+
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG}"
+
+PR = "r1"
+
+S = "${WORKDIR}/git/tests/fs-tests"
+
+FILES_${PN} = "${datadir}/mtd-utils"
+
+do_compile () {
+	make || die "Make failed"
+}
+
+do_stage () {
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+mtd_utils_tests = " \
+	help_all.sh \
+	run_all.sh \
+	integrity/integck \
+	simple/ftrunc \
+	simple/test_1 \	
+	simple/test_2 \	
+	stress/stress00.sh \
+	stress/stress01.sh \
+	stress/atoms/fwrite00 \
+	stress/atoms/gcd_hupper \
+	stress/atoms/pdfrun \
+	stress/atoms/rmdir00 \
+	stress/atoms/rndrm00 \
+	stress/atoms/rndrm99 \
+	stress/atoms/rndwrite00 \
+	stress/atoms/stress_1 \
+	stress/atoms/stress_2 \
+	stress/atoms/stress_3 \
+	utils/free_space \
+	utils/fstest_monitor \
+	"
+	
+do_install () {
+	install -d ${D}${datadir}/mtd-utils/tests
+	install -d ${D}${datadir}/mtd-utils/tests/integrity  
+	install -d ${D}${datadir}/mtd-utils/tests/simple  
+	install -d ${D}${datadir}/mtd-utils/tests/stress
+	install -d ${D}${datadir}/mtd-utils/tests/stress/atoms
+	install -d ${D}${datadir}/mtd-utils/tests/utils
+	for app in ${mtd_utils_tests}; do
+		install -m 0755 $app ${D}${datadir}/mtd-utils/tests/$app
+	done
+}
+
+
diff --git a/packages/networkmanager/files/25NetworkManager b/packages/networkmanager/files/25NetworkManager
new file mode 100644
index 0000000000..8e4dec167f
--- /dev/null
+++ b/packages/networkmanager/files/25NetworkManager
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# NetworkManager startup script
+
+. /etc/profile
+
+case $1 in
+  'start')
+    echo -n "Starting NetworkManager daemon: NetworkManager"
+    /usr/sbin/NetworkManager 
+    /usr/sbin/NetworkManagerDispatcher
+    echo "."
+  ;;
+
+  'stop')
+    echo -n "Stopping NetworkManager daemon: NetworkManager"
+    kill `ps |grep  /usr/sbin/NetworkManagerDispatcher | grep -v grep | cut "-d " -f2`
+    kill `ps |grep  /usr/sbin/NetworkManager | grep -v grep | cut "-d " -f2`
+    echo "."
+  ;;
+
+  'restart')
+    $0 stop
+    $0 start
+  ;;
+
+  *)
+    echo "Usage: $0 { start | stop | restart }"
+  ;;
+esac
diff --git a/packages/networkmanager/files/applet-no-gnome.diff b/packages/networkmanager/files/applet-no-gnome.diff
new file mode 100644
index 0000000000..e098e8c9ed
--- /dev/null
+++ b/packages/networkmanager/files/applet-no-gnome.diff
@@ -0,0 +1,59 @@
+---
+ configure.ac |    3 +--
+ src/main.c   |    8 ++++++++
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+Index: src/main.c
+===================================================================
+--- src/main.c.orig	2007-09-26 10:39:16.000000000 +0100
++++ src/main.c	2007-09-26 10:39:37.000000000 +0100
+@@ -27,7 +27,9 @@
+ 
+ #include <string.h>
+ #include <gtk/gtk.h>
++#if 0
+ #include <libgnomeui/libgnomeui.h>
++#endif
+ #include <glib/gi18n-lib.h>
+ 
+ #include "applet.h"
+@@ -36,11 +38,15 @@
+ int main (int argc, char *argv[])
+ {
+ 	NMApplet * applet;
++#if 0
+ 	GnomeProgram * program;
+ 
+ 	program = gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE,
+ 				      argc, argv, 
+ 				      GNOME_PARAM_NONE, GNOME_PARAM_NONE);
++#else
++	gtk_init (&argc, &argv);
++#endif
+ 
+ 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+@@ -53,7 +59,9 @@ int main (int argc, char *argv[])
+ 	gtk_main ();
+ 
+ 	g_object_unref (applet);
++#if 0
+ 	g_object_unref (program);
++#endif
+ 
+ 	exit (0);
+ }
+Index: configure.ac
+===================================================================
+--- configure.ac.orig	2007-09-26 10:39:30.000000000 +0100
++++ configure.ac	2007-09-26 10:39:37.000000000 +0100
+@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA,
+ 		 gtk+-2.0 >= 2.6
+ 		 libglade-2.0
+ 		 gconf-2.0
+-		 gnome-keyring-1
+-		 libgnomeui-2.0])
++		 gnome-keyring-1])
+ 
+ ##### Find out the version of DBUS we're using
+ dbus_version=`pkg-config --modversion dbus-1`
diff --git a/packages/networkmanager/files/no-restarts.diff b/packages/networkmanager/files/no-restarts.diff
new file mode 100644
index 0000000000..20bdf82aab
--- /dev/null
+++ b/packages/networkmanager/files/no-restarts.diff
@@ -0,0 +1,21 @@
+Index: src/backends/NetworkManagerDebian.c
+===================================================================
+--- src/backends/NetworkManagerDebian.c	(revision 2881)
++++ src/backends/NetworkManagerDebian.c	(working copy)
+@@ -204,8 +204,6 @@
+  */
+ void nm_system_update_dns (void)
+ {
+-	nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart");
+-
+ }
+ 
+ 
+@@ -218,7 +216,6 @@
+  */
+ void nm_system_restart_mdns_responder (void)
+ {
+-	nm_spawn_process ("/usr/bin/killall -q -USR1 mDNSResponder");
+ }
+ 
+ 
diff --git a/packages/networkmanager/networkmanager-applet_svn.bb b/packages/networkmanager/networkmanager-applet_svn.bb
new file mode 100644
index 0000000000..d61e134e96
--- /dev/null
+++ b/packages/networkmanager/networkmanager-applet_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "GTK+ applet for NetworkManager" 
+LICENSE = "GPL"
+DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
+#TODO DEPENDS libnotify
+RDEPENDS = "networkmanager"
+
+inherit gnome gtk-icon-cache
+
+SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
+           file://applet-no-gnome.diff;patch=1;pnum=0"
+
+PV = "0.0+svnr${SRCREV}"
+
+S = "${WORKDIR}/trunk"
+
+FILES_${PN} += "${datadir}/nm-applet/ \
+        ${datadir}/gnome-vpn-properties/ \
+        ${datadir}/gnome/autostart/ \
+        "
diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc
index e11a52391d..ce819d64ac 100644
--- a/packages/networkmanager/networkmanager.inc
+++ b/packages/networkmanager/networkmanager.inc
@@ -54,13 +54,7 @@ FILES_libnmutil += "${libdir}/libnm-util.so.*"
 FILES_libnmglib += "${libdir}/libnm_glib.so.*"
 
 FILES_${PN} += "${datadir} \
-		${sbindir}/* \
-		${bindir}/* \
-		${sysconfdir} \
 		${libexecdir}"
 
-FILES_${PN}-dev += "${incdir} \
-		   ${libdir}/*.a \
-		   ${libdir}/*.la \
-		   ${libdir}/pkgconfig"
+FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
 
diff --git a/packages/networkmanager/networkmanager_svn.bb b/packages/networkmanager/networkmanager_svn.bb
index d879381975..610bd01e7e 100644
--- a/packages/networkmanager/networkmanager_svn.bb
+++ b/packages/networkmanager/networkmanager_svn.bb
@@ -1,14 +1,55 @@
-require networkmanager.inc
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
+RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
 
-PV = "0.6.5+svn${SRCDATE}"
-PR = "r0"
+PV = "0.7+svnr${SRCREV}"
+PR = "r2"
 
-SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
-	file://NetworkManager \
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
+	file://no-restarts.diff;patch=1;pnum=0 \
+	file://25NetworkManager \
 	file://99_networkmanager"
 
-DEFAULT_PREFERENCE = "-1"
+EXTRA_OECONF = " \
+		--with-distro=debian \
+		--with-ip=/sbin/ip"
+# TODO: will /bin/ip from busybox do?
 
-S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+S = "${WORKDIR}/trunk"
 
+inherit autotools pkgconfig
 
+do_install_append () {
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+	install -d ${D}/etc/dbus-1/event.d
+	install -m 0755 ${WORKDIR}/25NetworkManager ${D}/etc/dbus-1/event.d
+}
+
+do_stage () {
+	autotools_stage_all
+}
+
+pkg_postinst () {
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+        /etc/init.d/populate-volatile.sh update
+}
+
+PACKAGES =+ "libnmutil libnmglib"
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+
+FILES_libnmglib += "${libdir}/libnm_glib.so.*"
+
+FILES_${PN}-dev = "${includedir}/* \
+        ${libdir}/*.so \
+        ${libdir}/*.a \
+        ${libdir}/pkgconfig/*.pc \
+        ${datadir}/NetworkManager/gdb-cmd \
+        "
diff --git a/packages/openmoko-base/openmoko-sound-system/session b/packages/openmoko-base/openmoko-sound-system/session
index dfef83d934..ed2346d55f 100644
--- a/packages/openmoko-base/openmoko-sound-system/session
+++ b/packages/openmoko-base/openmoko-sound-system/session
@@ -22,7 +22,7 @@ load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
 load-module module-x11-bell sample=x11-bell
 
 # Load samples
-load-sample startup /usr/share/openmoko/sounds/startup_openmoko.wav
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
 load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
 load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
 
diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
index f42b75ecb0..9ce0929f0d 100644
--- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard sound theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 PV = "0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko-base autotools
 
@@ -14,7 +14,7 @@ do_install() {
         for i in *.mp3; do
                 cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
-        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_openmoko.wav; do
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
                 cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
         done
 }
diff --git a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
index 76401a2b58..079d6ffeea 100644
--- a/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
+++ b/packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
-DEPENDS = "libgsmd"
+DEPENDS = "libgsmd libnotify"
 PV = "0.1.0+svn${SVNREV}"
 PR = "r0"
 
diff --git a/packages/openmoko2/neod/.mtn2git_empty b/packages/openmoko2/neod/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/neod/.mtn2git_empty
diff --git a/packages/openmoko2/neod/htc.patch b/packages/openmoko2/neod/htc.patch
new file mode 100644
index 0000000000..0ced894a45
--- /dev/null
+++ b/packages/openmoko2/neod/htc.patch
@@ -0,0 +1,32 @@
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac	2007-09-15 23:01:30.000000000 +0200
++++ neod/configure.ac	2007-09-15 23:02:01.000000000 +0200
+@@ -32,6 +32,10 @@
+         NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
+ fi
+ 
++if test x"$neod_platform" = x"htc"; then
++	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c	2007-09-15 23:02:15.000000000 +0200
++++ neod/src/buttonactions.c	2007-09-15 23:04:16.000000000 +0200
+@@ -63,6 +63,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_HTC
++    #define AUX_BUTTON_KEYCODE 0xd4   /* camera */
++    #define POWER_BUTTON_KEYCODE 0x74 /* power */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];
diff --git a/packages/openmoko2/neod/ipaq.patch b/packages/openmoko2/neod/ipaq.patch
new file mode 100644
index 0000000000..19b61ab1f5
--- /dev/null
+++ b/packages/openmoko2/neod/ipaq.patch
@@ -0,0 +1,32 @@
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c	2007-09-29 17:24:43.000000000 +0200
++++ neod/src/buttonactions.c	2007-09-29 17:24:49.000000000 +0200
+@@ -69,6 +69,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_IPAQ
++    #define AUX_BUTTON_KEYCODE 89   /* _KEY_RECORD */
++    #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac	2007-09-29 17:25:12.000000000 +0200
++++ neod/configure.ac	2007-09-29 17:25:48.000000000 +0200
+@@ -36,6 +36,10 @@
+ 	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
+ fi
+ 
++if test x"$neod_platform" = x"ipaq"; then
++	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index b382fc2c88..6e6c3b6019 100644
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -2,10 +2,13 @@ DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
 SECTION = "openmoko/daemons"
 DEPENDS = "gconf gtk+ pulseaudio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2 gconf
 
+SRC_URI += "file://htc.patch;patch=1 \
+            file://ipaq.patch;patch=1"
+
 EXTRA_OECONF_fic-gta01 = "--with-platform=neo1973"
 EXTRA_OECONF_fic-gta02 = "--with-platform=neo1973"
 EXTRA_OECONF_a780      = "--with-platform=ezx"
@@ -13,6 +16,8 @@ EXTRA_OECONF_a1200     = "--with-platform=ezx"
 EXTRA_OECONF_e680      = "--with-platform=ezx"
 EXTRA_OECONF_rokre2    = "--with-platform=ezx"
 EXTRA_OECONF_rokre6    = "--with-platform=ezx"
+EXTRA_OECONF_magician  = "--with-platform=htc"
+EXTRA_OECONF_hx4700    = "--with-platform=ipaq"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index 9650a20b0d..14a71d423a 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -10,3 +10,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
 S = "${WORKDIR}/jana/"
 
 EXTRA_OECONF = "--with-frontend=openmoko"
+
+do_configure_prepend() {
+	touch gtk-doc.make
+}
+
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index b006f6d6dc..ec3b4f702e 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 PV = "0.1.0+${SVNREV}"
-PR = "r3"
+PR = "r4"
 
 inherit openmoko2
 
@@ -15,11 +15,7 @@ do_install() {
 	cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
 	rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
 	
-	install -d ${D}${sysconfdir}/gtk-2.0
-	echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
 }
 
-CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
-
 PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir} ${sysconfdir}"
+FILES_${PN} = "${datadir}"
diff --git a/packages/pimlico/tasks-0.12/.mtn2git_empty b/packages/pimlico/tasks-0.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pimlico/tasks-0.12/.mtn2git_empty
diff --git a/packages/pimlico/tasks-0.12/tasks-owl.diff b/packages/pimlico/tasks-0.12/tasks-owl.diff
new file mode 100644
index 0000000000..ce1ed9db7e
--- /dev/null
+++ b/packages/pimlico/tasks-0.12/tasks-owl.diff
@@ -0,0 +1,62 @@
+Index: src/gtk/tasks-ui.xml
+===================================================================
+--- src/gtk/tasks-ui.xml	(revision 338)
++++ src/gtk/tasks-ui.xml	(working copy)
+@@ -7,17 +7,14 @@
+       <menuitem action="EditTask"/>
+       <menuitem action="CompleteTask"/>
+       <separator/>
++      <menuitem action="Undo"/>
++      <menuitem action="Redo"/>
++      <separator/>
+       <menuitem action="DeleteTask"/>
+       <menuitem action="PurgeTasks"/>
+       <separator/>
++      <menuitem action="About"/>
+       <menuitem action="Quit"/>
+     </menu>
+-    <menu action="EditMenu">
+-      <menuitem action="Undo"/>
+-      <menuitem action="Redo"/>
+-    </menu>
+-    <menu action="HelpMenu">
+-      <menuitem action="About"/>
+-    </menu>
+   </menubar>
+ </ui>
+Index: src/gtk/main.c
+===================================================================
+--- src/gtk/main.c	(revision 338)
++++ src/gtk/main.c	(working copy)
+@@ -21,6 +21,7 @@
+ #include <libecal/e-cal.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#include <owlwindowmenu.h>
+ 
+ #include <libkoto/ical-util.h>
+ #include <libkoto/koto-actions.h>
+@@ -564,8 +565,8 @@
+   gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
+   gtk_ui_manager_ensure_update (ui_manager);
+ 
+-  menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
+-  gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0);
++  menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu");
++  owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu));
+ 
+   box = gtk_vbox_new (FALSE, 4);
+   gtk_container_set_border_width (GTK_CONTAINER (box), 4);
+Index: src/gtk/Makefile.am
+===================================================================
+--- src/gtk/Makefile.am	(revision 338)
++++ src/gtk/Makefile.am	(working copy)
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = tasks
+ tasks_CPPFLAGS = -I$(top_srcdir)/
+ tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
+-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) 
++tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)  -lowl
+ 
+ tasks_SOURCES = \
+ 	main.c \
diff --git a/packages/pimlico/tasks_svn.bb b/packages/pimlico/tasks_svn.bb
index b3da6ebe20..5ad983ad97 100644
--- a/packages/pimlico/tasks_svn.bb
+++ b/packages/pimlico/tasks_svn.bb
@@ -2,7 +2,7 @@ require tasks.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.10+svnr${SRCREV}"
+PV = "0.12+svnr${SRCREV}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
diff --git a/packages/pointercal/files/nokia800/pointercal b/packages/pointercal/files/nokia800/pointercal.broken
index da96ce5a88..da96ce5a88 100644
--- a/packages/pointercal/files/nokia800/pointercal
+++ b/packages/pointercal/files/nokia800/pointercal.broken
diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb
index a50281b682..4fa8c1cc0e 100644
--- a/packages/pointercal/pointercal_0.0.bb
+++ b/packages/pointercal/pointercal_0.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc
index 478a5ed357..f73ac0e048 100644
--- a/packages/portmap/portmap.inc
+++ b/packages/portmap/portmap.inc
@@ -1,6 +1,7 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
+DEPENDS = "fakeroot-native"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
 	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb
index 98a7251a7e..71c68c2fb8 100644
--- a/packages/ppp/ppp_2.4.3.bb
+++ b/packages/ppp/ppp_2.4.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 DEPENDS = "libpcap"
 LICENSE = "BSD GPLv2"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 	file://makefile.patch;patch=1 \
@@ -28,6 +28,10 @@ inherit autotools
 EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
 EXTRA_OECONF = "--disable-strip"
 
+do_stage () {
+         make INCDIR=${STAGING_INCDIR} install-devel
+}
+
 do_install_append () {
 	make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
 	mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
diff --git a/packages/procps/procps-3.2.7/linux-limits.patch b/packages/procps/procps-3.2.7/linux-limits.patch
new file mode 100644
index 0000000000..dcd66163ad
--- /dev/null
+++ b/packages/procps/procps-3.2.7/linux-limits.patch
@@ -0,0 +1,13 @@
+diff --git a/pwdx.c b/pwdx.c
+index cb96a52..29ebce2 100644
+--- a/pwdx.c
++++ b/pwdx.c
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <regex.h>
+-#include <limits.h>
++#include <linux/limits.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
diff --git a/packages/procps/procps_3.2.7.bb b/packages/procps/procps_3.2.7.bb
index de7524b2cb..e6a6573635 100644
--- a/packages/procps/procps_3.2.7.bb
+++ b/packages/procps/procps_3.2.7.bb
@@ -3,7 +3,8 @@ require procps.inc
 PR = "r5"
 
 SRC_URI += "file://procmodule.patch;patch=1 \
-            file://psmodule.patch;patch=1"
+            file://psmodule.patch;patch=1 \
+	    file://linux-limits.patch;patch=1"
 
 FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
 	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 6ba212df59..3d46d47bd0 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -143,8 +143,8 @@ RDEPENDS_python-fcntl="python-core"
 FILES_python-fcntl="${libdir}/python2.5/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml1"
-RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
+PR_python-netclient="ml2"
+RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime python-stringold"
 FILES_python-netclient="${libdir}/python2.5/*Cookie*.* ${libdir}/python2.5/base64.* ${libdir}/python2.5/cookielib.* ${libdir}/python2.5/ftplib.* ${libdir}/python2.5/gopherlib.* ${libdir}/python2.5/hmac.* ${libdir}/python2.5/httplib.* ${libdir}/python2.5/mimetypes.* ${libdir}/python2.5/nntplib.* ${libdir}/python2.5/poplib.* ${libdir}/python2.5/smtplib.* ${libdir}/python2.5/telnetlib.* ${libdir}/python2.5/urllib.* ${libdir}/python2.5/urllib2.* ${libdir}/python2.5/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
@@ -198,8 +198,8 @@ RDEPENDS_python-mailbox="python-core python-mime"
 FILES_python-mailbox="${libdir}/python2.5/mailbox.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
-PR_python-xml="ml1"
-RDEPENDS_python-xml="python-core python-re"
+PR_python-xml="ml2"
+RDEPENDS_python-xml="python-core python-re python-netclient"
 FILES_python-xml="${libdir}/python2.5/lib-dynload/pyexpat.so ${libdir}/python2.5/xml ${libdir}/python2.5/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
diff --git a/packages/python/python-native-2.5.1/cross-distutils.patch b/packages/python/python-native-2.5.1/cross-distutils.patch
index 76ae883c1d..3356c1abbe 100644
--- a/packages/python/python-native-2.5.1/cross-distutils.patch
+++ b/packages/python/python-native-2.5.1/cross-distutils.patch
@@ -16,22 +16,20 @@
  
  # python_build: (Boolean) if true, we're either building Python or
  # building an extension with an un-installed Python, so we use
-@@ -192,7 +192,8 @@
+@@ -192,7 +192,7 @@
      else:
          # The name of the config.h file changed in 2.2
          config_h = 'pyconfig.h'
 -    return os.path.join(inc_dir, config_h)
-+    print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
 +    return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
  
  
  def get_makefile_filename():
-@@ -200,7 +201,8 @@
+@@ -200,7 +200,7 @@
      if python_build:
          return os.path.join(os.path.dirname(sys.executable), "Makefile")
      lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
 -    return os.path.join(lib_dir, "config", "Makefile")
-+    print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded"
 +    return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
  
  
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index fdaefe549a..a64a4f96c8 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 DEPENDS = ""
-PR = "ml0"
+PR = "ml1"
 
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/packages/redboot-utils/fis_1.0.bb b/packages/redboot-utils/fis_1.0.bb
index 87246f2717..e1ac56448b 100644
--- a/packages/redboot-utils/fis_1.0.bb
+++ b/packages/redboot-utils/fis_1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
 S="${WORKDIR}/trunk"
 
 export CFLAGS += "--std=c99"
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index ad05d54851..67367d5192 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,11 +3,11 @@ SECTION = "console/utils"
 LICENSE = "BSD"
 DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
 flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r11"
+PR = "r12"
 
 RDEPENDS = "perl"
 
-SLUGIMAGE_SVN_REV  ?= "103"
+SLUGIMAGE_SVN_REV  ?= "104"
 SLUGIMAGE_SVN_REPO ?= "http://svn.nslu2-linux.org/svnroot/slugimage/trunk"
 
 addtask svnfetch before do_configure after do_patch
diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default
index 82bf55970c..7ad3c7bf8f 100644
--- a/packages/sysvinit/sysvinit/rcS-default
+++ b/packages/sysvinit/sysvinit/rcS-default
@@ -15,6 +15,8 @@ DELAYLOGIN=no
 VERBOSE=no
 # Set EDITMOTD to "no" if you don't want /etc/motd to be editted automatically
 EDITMOTD=no
+# Whether to fsck root on boot
+ENABLE_ROOTFS_FSCK=no
 # Set FSCKFIX to "yes" if you want to add "-y" to the fsck at startup.
 FSCKFIX=yes
 # Set TICKADJ to the correct tick value for this specific machine
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index a4ce1252f8..f87c3f917a 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r35"
+PR = "r36"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 84a37afe1d..1c97a355f1 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r14"
+PR = "r15"
 
 inherit task
 
@@ -16,6 +16,7 @@ RDEPENDS_task-openmoko-feed = "\
   ipkg-link ipkg-utils \
   joe \
   kbdd \
+  kexec-tools \
   midori \
   mplayer \
   mtpaint \
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch b/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
new file mode 100644
index 0000000000..2ed26c3127
--- /dev/null
+++ b/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
@@ -0,0 +1,17 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile	2007-10-03 16:51:38.000000000 +0100
++++ git/tools/Makefile	2007-10-03 16:52:03.000000000 +0100
+@@ -114,9 +114,9 @@
+ #
+ # Use native tools and options
+ #
+-CPPFLAGS   = -idirafter $(SRCTREE)/include \
+-		-idirafter $(OBJTREE)/include2 \
+-		-idirafter $(OBJTREE)/include \
++CPPFLAGS   = -I$(SRCTREE)/include \
++		-I$(OBJTREE)/include2 \
++		-I$(OBJTREE)/include \
+ 		-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+ CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
+ AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
index 8d69a54c4c..d0d47d84d8 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
+++ b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
@@ -55,6 +55,7 @@ file://uboot-gta02.patch;patch=1 \
 file://uboot-s3c2443.patch;patch=1 \
 file://uboot-smdk2443.patch;patch=1 \
 file://unbusy-i2c.patch;patch=1 \
+file://makefile-no-dirafter.patch;patch=1 \
 "
 
 PROVIDES = ""
diff --git a/packages/udev/files/akita/.mtn2git_empty b/packages/udev/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/akita/.mtn2git_empty
diff --git a/packages/udev/files/akita/mount.blacklist b/packages/udev/files/akita/mount.blacklist
new file mode 100644
index 0000000000..7e351bc988
--- /dev/null
+++ b/packages/udev/files/akita/mount.blacklist
@@ -0,0 +1,6 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
+/dev/loop
+/dev/ram
+\ No newline at end of file
diff --git a/packages/udev/files/c7x0/.mtn2git_empty b/packages/udev/files/c7x0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/c7x0/.mtn2git_empty
diff --git a/packages/udev/files/c7x0/mount.blacklist b/packages/udev/files/c7x0/mount.blacklist
new file mode 100644
index 0000000000..7e351bc988
--- /dev/null
+++ b/packages/udev/files/c7x0/mount.blacklist
@@ -0,0 +1,6 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
+/dev/loop
+/dev/ram
+\ No newline at end of file
diff --git a/packages/udev/files/mount.blacklist b/packages/udev/files/mount.blacklist
index 23b45ad8e3..d3ebb17176 100644
--- a/packages/udev/files/mount.blacklist
+++ b/packages/udev/files/mount.blacklist
@@ -1,3 +1,3 @@
 /dev/loop
-/dev/mtdblock
 /dev/ram
+/dev/mtdblock
diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh
index 7c4bd00981..5016328df4 100644
--- a/packages/udev/files/network.sh
+++ b/packages/udev/files/network.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
-# we need /sbin in our PATH
-PATH="/sbin:/usr/sbin/:$PATH"
 
 # Do not run when pcmcia-cs is installed
 test -x /sbin/cardctl && exit 0
diff --git a/packages/udev/files/tosa/.mtn2git_empty b/packages/udev/files/tosa/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/files/tosa/.mtn2git_empty
diff --git a/packages/udev/files/tosa/mount.blacklist b/packages/udev/files/tosa/mount.blacklist
new file mode 100644
index 0000000000..7e351bc988
--- /dev/null
+++ b/packages/udev/files/tosa/mount.blacklist
@@ -0,0 +1,6 @@
+# This is a grep pattern matched against the device name
+# Any matched pattern will _not_ be mounted / removed by udevd
+
+/dev/mtdblock
+/dev/loop
+/dev/ram
+\ No newline at end of file
diff --git a/packages/udev/udev-115/.mtn2git_empty b/packages/udev/udev-115/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev-115/.mtn2git_empty
diff --git a/packages/udev/udev-115/flags.patch b/packages/udev/udev-115/flags.patch
new file mode 100644
index 0000000000..13f20eb6a8
--- /dev/null
+++ b/packages/udev/udev-115/flags.patch
@@ -0,0 +1,56 @@
+---
+ Makefile |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: udev-115/Makefile
+===================================================================
+--- udev-115.orig/Makefile	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/Makefile	2007-09-20 17:21:45.000000000 +0200
+@@ -112,39 +112,39 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS	= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS	+= $(WARNINGS)
+ 
+ LDFLAGS += -Wl,-warn-common,--as-needed
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	CFLAGS += -DUSE_SELINUX
++	override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-	CFLAGS += -DUSE_STATIC
++	override CFLAGS += -DUSE_STATIC
+ 	LDFLAGS += -static
+ endif
+ 
diff --git a/packages/udev/udev-115/init b/packages/udev/udev-115/init
new file mode 100644
index 0000000000..73c655a0ee
--- /dev/null
+++ b/packages/udev/udev-115/init
@@ -0,0 +1,227 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs 
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+# we need to unmount /dev/pts/ and remount it later over the tmpfs
+unmount_devpts() {
+  if mountpoint -q /dev/pts/; then
+    umount -l /dev/pts/
+  fi
+
+  if mountpoint -q /dev/shm/; then
+    umount -l /dev/shm/
+  fi
+}
+
+# mount a tmpfs over /dev, if somebody did not already do it
+mount_tmpfs() {
+  if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
+    return
+  fi
+
+  # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
+  # /etc/udev/ is recycled as a temporary mount point because it's the only
+  # directory which is guaranteed to be available.
+  mount -n -o bind /dev /etc/udev
+
+  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+# I hate this hack.  -- Md
+make_extra_nodes() {
+  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
+    cp -a /lib/udev/devices/* /dev/
+  fi
+
+  [ -e /etc/udev/links.conf ] || return 0
+  grep '^[^#]' /etc/udev/links.conf | \
+  while read type name arg1; do
+    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
+    case "$type" in
+      L) ln -s $arg1 /dev/$name ;;
+      D) mkdir -p /dev/$name ;;
+      M) mknod -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+set_hotplug_handler() {
+  case "$(uname -r)" in
+    2.6.1[0-4]|2.6.1[0-4][!0-9]*) HANDLER='/sbin/udevsend' ;;
+  esac
+  echo $HANDLER > /proc/sys/kernel/hotplug
+}
+
+# shell version of /usr/bin/tty
+my_tty() {
+  [ -x /bin/readlink ] || return 0
+  [ -e /proc/self/fd/0 ] || return 0
+  readlink --silent /proc/self/fd/0 || true
+}
+
+warn_if_interactive() {
+  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+    return
+  fi
+
+  TTY=$(my_tty)
+  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+    return
+  fi
+
+  printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
+  printf "has been run from an interactive shell.\n"
+  printf "It will probably not do what you expect, so this script will wait\n"
+  printf "60 seconds before continuing. Press ^C to stop it.\n"
+  printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
+  sleep 60
+}
+
+##############################################################################
+
+PATH="/sbin:/bin:/usr/bin"
+
+[ -x /sbin/udevd ] || exit 0
+
+# defaults
+tmpfs_size="2M"
+udev_root="/dev"
+udevd_timeout=30
+
+. /etc/udev/udev.conf
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.12, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/filesystems ]; then
+  echo "udev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "udev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "udev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ]; then
+  echo "udev requires hotplug support, not started."
+  exit 1
+fi
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevsynthesize has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+
+case "$1" in
+    start)
+    if [ -e "$udev_root/.udev/" ]; then
+	if mountpoint -q /dev/; then
+	    TMPFS_MOUNTED=1
+	else
+	    echo ".udev/ already exists on the static $udev_root!"
+	fi
+    else
+	warn_if_interactive
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+
+    set_hotplug_handler
+
+    if [ -z "$TMPFS_MOUNTED" ]; then
+	unmount_devpts
+	mount_tmpfs
+	[ -d /proc/1 ] || mount -n /proc
+    fi
+
+    # if this directory is not present /dev will not be updated by udev
+    mkdir -p /dev/.udev/ /dev/.udev/db/ /dev/.udev/queue/ /dev/.udevdb/
+    # /dev/null must be created before udevd is started
+    make_extra_nodes
+
+    echo "Synthesizing the initial hotplug events"
+    udevtrigger
+
+    # wait for the udevd childs to finish
+    echo "Waiting for /dev to be fully populated"
+    while [ -d /dev/.udev/queue/ ]; do
+	sleep 1
+	udevd_timeout=$(($udevd_timeout - 1))
+	if [ $udevd_timeout -eq 0 ]; then
+	    # ps axf
+	    break
+	fi
+    done
+    if [ $udevd_timeout -eq 0 ]; then
+	echo 'timeout'
+    fi
+    ;;
+
+    stop)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+
+    restart|force-reload)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    if start-stop-daemon --stop --name udevd --quiet ; then
+	exit 1
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+    ;;
+
+    *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/packages/udev/udev-115/local.rules b/packages/udev/udev-115/local.rules
new file mode 100644
index 0000000000..5b926018f5
--- /dev/null
+++ b/packages/udev/udev-115/local.rules
@@ -0,0 +1,31 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-115/noasmlinkage.patch b/packages/udev/udev-115/noasmlinkage.patch
new file mode 100644
index 0000000000..5824d29590
--- /dev/null
+++ b/packages/udev/udev-115/noasmlinkage.patch
@@ -0,0 +1,36 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+---
+ udevd.c     |    2 +-
+ udevstart.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: udev-115/udevd.c
+===================================================================
+--- udev-115.orig/udevd.c	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevd.c	2007-09-20 17:04:51.000000000 +0200
+@@ -767,7 +767,7 @@
+ 	return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGINT:
+Index: udev-115/udevstart.c
+===================================================================
+--- udev-115.orig/udevstart.c	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevstart.c	2007-09-20 17:04:51.000000000 +0200
+@@ -304,7 +304,7 @@
+ 	}
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGALRM:
diff --git a/packages/udev/udev-115/permissions.rules b/packages/udev/udev-115/permissions.rules
new file mode 100644
index 0000000000..99e03b1036
--- /dev/null
+++ b/packages/udev/udev-115/permissions.rules
@@ -0,0 +1,101 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
+
+# default permissions for block devices
+SUBSYSTEM=="block",				GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",				GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
+BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",	MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",			GROUP="plugdev", \
+	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
+
+# serial devices
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
+
+# vc devices (all members of the tty subsystem)
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
+
+# video devices
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
+
+# misc devices
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="rtc",					GROUP="audio"
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
+
+# sound devices
+SUBSYSTEM=="sound",				GROUP="audio"
+
+# ieee1394 devices       
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
+
+# input devices
+KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/packages/udev/udev-115/udev.rules b/packages/udev/udev-115/udev.rules
new file mode 100644
index 0000000000..72be706e84
--- /dev/null
+++ b/packages/udev/udev-115/udev.rules
@@ -0,0 +1,102 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+					SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+	PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",		NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",		NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",		NAME="hwrng"
+KERNEL=="tun",			NAME="net/%k"
+
+KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
+KERNEL=="pktcdvd",		NAME="pktcdvd/control"
+
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
+KERNEL=="microcode",		NAME="cpu/microcode"
+
+KERNEL=="umad*",		NAME="infiniband/%k"
+KERNEL=="issm*",		NAME="infiniband/%k"
+KERNEL=="uverbs*",		NAME="infiniband/%k"
+KERNEL=="ucm",			NAME="infiniband/%k"
+
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
+# ALSA devices
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# ieee1394 devices       
+KERNEL=="dv1394*",		NAME="dv1394/%n"
+KERNEL=="video1394*",		NAME="video1394/%n"
+
+# input devices
+KERNEL=="mice",			NAME="input/%k"
+KERNEL=="mouse[0-9]*",		NAME="input/%k"
+KERNEL=="event[0-9]*",		NAME="input/%k"
+KERNEL=="js[0-9]*",		NAME="input/%k"
+KERNEL=="ts[0-9]*",		NAME="input/%k"
+KERNEL=="uinput",		NAME="input/%k"
+
+# Zaptel
+KERNEL=="zapctl",		NAME="zap/ctl"
+KERNEL=="zaptimer",		NAME="zap/timer"
+KERNEL=="zapchannel",		NAME="zap/channel"
+KERNEL=="zappseudo",		NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",		NAME="zap/%n"
+
+# AOE character devices
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+
+# device mapper creates its own device nodes, so ignore these
+KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
+
diff --git a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
new file mode 100644
index 0000000000..87cafcaa9d
--- /dev/null
+++ b/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
@@ -0,0 +1,104 @@
+---
+ udevtrigger.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+Index: udev-115/udevtrigger.c
+===================================================================
+--- udev-115.orig/udevtrigger.c	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevtrigger.c	2007-09-21 18:45:28.000000000 +0200
+@@ -39,6 +39,8 @@
+ LIST_HEAD(device_list);
+ LIST_HEAD(filter_subsystem_match_list);
+ LIST_HEAD(filter_subsystem_nomatch_list);
++LIST_HEAD(filter_kernel_match_list);
++LIST_HEAD(filter_kernel_nomatch_list);
+ LIST_HEAD(filter_attr_match_list);
+ LIST_HEAD(filter_attr_nomatch_list);
+ 
+@@ -218,6 +220,26 @@
+ 	return 0;
+ }
+ 
++static int kernel_filtered(const char *kernel)
++{
++	struct name_entry *loop_name;
++
++	/* skip devices matching the prohibited kernel device names */
++	list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
++		if (fnmatch(loop_name->name, kernel, 0) == 0)
++			return 1;
++
++	/* skip devices not matching the listed kernel device names */
++	if (!list_empty(&filter_kernel_match_list)) {
++		list_for_each_entry(loop_name, &filter_kernel_match_list, node)
++			if (fnmatch(loop_name->name, kernel, 0) == 0)
++				return 0;
++		return 1;
++	}
++
++	return 0;
++}
++
+ static int attr_filtered(const char *path)
+ {
+ 	struct name_entry *loop_name;
+@@ -296,6 +318,9 @@
+ 					if (dent2->d_name[0] == '.')
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -402,6 +427,9 @@
+ 					if (!strcmp(dent2->d_name, "device"))
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -458,6 +486,8 @@
+ 		{ "subsystem-nomatch", 1, NULL, 'S' },
+ 		{ "attr-match", 1, NULL, 'a' },
+ 		{ "attr-nomatch", 1, NULL, 'A' },
++		{ "kernel-match", 1, NULL, 'k' },
++		{ "kernel-nomatch", 1, NULL, 'K' },
+ 		{}
+ 	};
+ 
+@@ -496,6 +526,12 @@
+ 		case 'A':
+ 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
+ 			break;
++		case 'k':
++			name_list_add(&filter_kernel_match_list, optarg, 0);
++			break;
++		case 'K':
++			name_list_add(&filter_kernel_nomatch_list, optarg, 0);
++			break;
+ 		case 'h':
+ 			printf("Usage: udevtrigger OPTIONS\n"
+ 			       "  --verbose                       print the list of devices while running\n"
+@@ -504,6 +540,8 @@
+ 			       "                                  marked as failed during a previous run\n"
+ 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
+ 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
++			       "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
++			       "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
+ 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
+ 			       "                                  attribute\n"
+ 			       "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
+@@ -549,6 +587,8 @@
+ exit:
+ 	name_list_cleanup(&filter_subsystem_match_list);
+ 	name_list_cleanup(&filter_subsystem_nomatch_list);
++	name_list_cleanup(&filter_kernel_match_list);
++	name_list_cleanup(&filter_kernel_nomatch_list);
+ 	name_list_cleanup(&filter_attr_match_list);
+ 	name_list_cleanup(&filter_attr_nomatch_list);
+ 
diff --git a/packages/udev/udev-115/vol_id_ld.patch b/packages/udev/udev-115/vol_id_ld.patch
new file mode 100644
index 0000000000..11126eef8d
--- /dev/null
+++ b/packages/udev/udev-115/vol_id_ld.patch
@@ -0,0 +1,17 @@
+---
+ extras/volume_id/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: udev-115/extras/volume_id/Makefile
+===================================================================
+--- udev-115.orig/extras/volume_id/Makefile	2007-09-20 18:17:59.000000000 +0200
++++ udev-115/extras/volume_id/Makefile	2007-09-20 18:18:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+ 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+ else
+-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
++	$(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
+ endif
+ 
+ # man pages
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index e9c83d4e5a..d04b63e1e0 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -60,6 +60,8 @@ do_install () {
 
 do_stage () {
 	autotools_stage_all
+        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
+        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
 }
 
 PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 2732c73083..250b1d306f 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r21"
+PR = "r22"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_115.bb b/packages/udev/udev_115.bb
new file mode 100644
index 0000000000..9dd0bf2c8f
--- /dev/null
+++ b/packages/udev/udev_115.bb
@@ -0,0 +1,68 @@
+DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
+/dev/, handles hotplug events and loads drivers at boot time. It replaces \
+the hotplug package and requires a kernel not older than 2.6.12."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-115"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+	   file://noasmlinkage.patch;patch=1 \
+	   file://flags.patch;patch=1 \
+	   file://vol_id_ld.patch;patch=1 \
+	   file://udevtrigger_add_devname_filtering.patch;patch=1 \
+	   file://mount.blacklist \
+	   "
+
+require udev.inc
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+                   ${D}${sysconfdir} \
+                   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
+	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
+	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
+	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+	fi
+
+	install -d ${D}${sysconfdir}/udev/scripts/
+
+	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
+	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+
+	install -d ${D}${base_libdir}/udev/
+}
+
+pkg_postinst_append() {
+
+       # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
+       # causing confusion with fsck on boot
+
+        while read dev mp fs junk
+        do
+                if test "$mp" = "/"
+                then
+                        root_partition="$dev"
+                        echo "$root_partition" >> ${sysconfdir}/udev/mount.blacklist
+                fi
+        done < ${sysconfdir}/fstab
+}
+
diff --git a/packages/webkit/files/WebKit.pri b/packages/webkit/files/WebKit.pri
index 0375102a0c..350c95d311 100644
--- a/packages/webkit/files/WebKit.pri
+++ b/packages/webkit/files/WebKit.pri
@@ -6,14 +6,17 @@ isEmpty(OUTPUT_DIR) {
     CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
 }
 
-!gdk-port:CONFIG += qt-port
+!gtk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
-qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
-gdk-port:CONFIG += link_pkgconfig
-gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
-gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
-gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng -lcurl
-gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
+qt-port:!building-libs {
+    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+    LIBS += -lQtWebKit
+}
+gtk-port:CONFIG += link_pkgconfig
+gtk-port:PKGCONFIG += cairo cairo-ft gdk-2.0 gtk+-2.0 libcurl
+gtk-port:DEFINES += BUILDING_GTK__=1 BUILDING_CAIRO__
+gtk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGtk $$system(icu-config --ldflags) -ljpeg -lpng
+gtk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
 
 DEFINES += USE_SYSTEM_MALLOC
 CONFIG(release) {
@@ -23,12 +26,12 @@ CONFIG(release) {
 BASE_DIR = $$PWD
 qt-port:INCLUDEPATH += \
     $$PWD/WebKitQt/Api
-gdk-port:INCLUDEPATH += \
-    $$BASE_DIR/WebCore/platform/gdk \
+gtk-port:INCLUDEPATH += \
+    $$BASE_DIR/WebCore/platform/gtk \
     $$BASE_DIR/WebCore/platform/network/curl \
     $$BASE_DIR/WebCore/platform/graphics/cairo \
-    $$BASE_DIR/WebCore/loader/gdk \
-    $$BASE_DIR/WebCore/page/gdk \
+    $$BASE_DIR/WebCore/loader/gtk \
+    $$BASE_DIR/WebCore/page/gtk \
     $$BASE_DIR/WebKit/gtk/Api \
     $$BASE_DIR/WebKit/gtk/WebCoreSupport
 INCLUDEPATH += \
diff --git a/packages/webkit/files/WebKit.pro b/packages/webkit/files/WebKit.pro
index 335d11e6e7..8536c41515 100644
--- a/packages/webkit/files/WebKit.pro
+++ b/packages/webkit/files/WebKit.pro
@@ -1,13 +1,16 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-!gdk-port:CONFIG += qt-port
-qt-port:SUBDIRS += WebKitQt/Plugins
+!gtk-port:CONFIG += qt-port
+qt-port:!win32-*:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro
 
-qt-port:SUBDIRS += \
-        WebKitQt/QtLauncher \
-        WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
-gdk-port:SUBDIRS += \
-        WebKitTools/GdkLauncher
+qt-port {
+    SUBDIRS += WebKitQt/QtLauncher
+
+    !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro
+}
+
+gtk-port:SUBDIRS += \
+        WebKitTools/GtkLauncher
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 077baec95e..35ab38a167 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -23,10 +23,10 @@ SRC_URI = "\
 S = "${WORKDIR}/"
 
 do_configure() {
-	qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
+	qmake2 -spec ${QMAKESPEC} CONFIG+=gtk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
 	mkdir -p WebKitBuilds/Debug
 	cd WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
       WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
 }
 
@@ -43,9 +43,9 @@ do_install() {
 	install -d ${D}${libdir}
 	install -d ${D}${libdir}/pkgconfig
 
-	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
+	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
 	cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
       WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
 	oe_runmake install
 }
@@ -54,12 +54,12 @@ do_stage() {
 	install -d ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}
 	cd ${S}/WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro \
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
       WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
 	oe_runmake install
 }
 
-PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
+PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
 
-FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"
-FILES_webkit-gdklauncher-dbg = "${bindir}/.debug/GdkLauncher"
+FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
+FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
diff --git a/packages/wifistix/.mtn2git_empty b/packages/wifistix/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wifistix/.mtn2git_empty
diff --git a/packages/wifistix/wifistix-modules/.mtn2git_empty b/packages/wifistix/wifistix-modules/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/.mtn2git_empty
diff --git a/packages/wifistix/wifistix-modules/2.6.17-new-pcmcia-layer.patch b/packages/wifistix/wifistix-modules/2.6.17-new-pcmcia-layer.patch
new file mode 100644
index 0000000000..209df1b121
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/2.6.17-new-pcmcia-layer.patch
@@ -0,0 +1,484 @@
+Index: src_cf8385/io/mcf/cf_io.c
+===================================================================
+--- src_cf8385.orig/io/mcf/cf_io.c
++++ src_cf8385/io/mcf/cf_io.c
+@@ -49,17 +49,15 @@ Change log:
+ 
+ dev_info_t cfio_dev_info = "mcf25";
+ 
+-dev_link_t *dev_list 	 = NULL;
+-
+-MODULE_PARM(interrupt_steer, "1-4i");
+-
+-INT_MODULE_PARM(irq_mask, CF_IRQMASK);
+-
+ /* Module Variables */
+ static int interrupt_steer[IRQINFO2_LEN] = { -1 };
++static u_int irq_mask = CF_IRQMASK;
++
++module_param_array(interrupt_steer, int, NULL, 0);
++module_param(irq_mask, int, 0);
+ 
+ typedef struct _if_pcmcia_info_t {
+-  dev_link_t link;
++  struct pcmcia_device *p_dev;
+   dev_node_t node;
+   int stop;
+   struct bus_operations *bus;
+@@ -81,22 +79,9 @@ struct cf_card_rec cardp;
+  *  @param arg       pointer to dev_link_t
+  *  @return 	     N/A
+  */
+-static void cf_release(ulong arg)
++static void mv8385_cf_release(struct pcmcia_device *arg)
+ {
+-  dev_link_t *link = (dev_link_t *) arg;
+-
+-  link->dev = NULL;
+-
+-  link->conf.Vcc = 0;
+-  pcmcia_release_configuration(link->handle);
+-  if (link->io.NumPorts1)
+-    pcmcia_release_io(link->handle, &link->io);
+-
+-  if (link->irq.AssignedIRQ)
+-    pcmcia_release_irq(link->handle, &link->irq);
+-
+-  link->state &= ~DEV_CONFIG;
+-
++  pcmcia_disable_device(arg);
+ } /* cf_release */
+ 
+ 
+@@ -107,41 +92,9 @@ static void cf_release(ulong arg)
+  *  @return 	     N/A
+  */
+ 
+-static void cf_detach(dev_link_t * link)
++static void mv8385_cf_detach(struct pcmcia_device * link)
+ {
+-  dev_link_t **p;
+-
+-  for (p = &dev_list; *p; p = &(*p)->next)
+-    if (*p == link)
+-      break;
+-
+-  if (*p == NULL)
+-    return;
+-
+-#ifdef LINUX_2_4
+-  del_timer_sync(&link->release);
+-#endif
+-
+-  if (((if_pcmcia_info_t *) link->priv)->eth_dev) {
+-    printk("Before calling wlan_remove function\n");
+-    cardp.remove(&cardp);
+-    printk("After calling wlan_remove function\n");
+-  }
+-
+-  if (link->state & DEV_CONFIG) {
+-    cf_release((u32) link);
+-  }
+-
+-  ((if_pcmcia_info_t *) link->priv)->eth_dev = NULL;
+-
+-  if (link->handle) {
+-#ifdef LINUX_2_4
+-    pcmcia_reset_card(link->handle, NULL);
+-#endif
+-    pcmcia_deregister_client(link->handle);
+-  }
+-
+-  *p = link->next;
++  mv8385_cf_release(link);
+   /* This points to the parent if_pcmcia_info_t struct */
+   if (link->priv)
+     kfree(link->priv);
+@@ -152,9 +105,8 @@ static void cf_detach(dev_link_t * link)
+  *  @param link      pointer to dev_link_t
+  *  @return 	     N/A
+  */
+-static void cf_config(dev_link_t * link)
++static int mv8385_cf_config(struct pcmcia_device * link)
+ {
+-  client_handle_t handle = link->handle;
+   if_pcmcia_info_t *dev = link->priv;
+   tuple_t tuple;
+   cisparse_t parse;
+@@ -169,22 +121,14 @@ static void cf_config(dev_link_t * link)
+   tuple.TupleDataMax = sizeof(buf);
+   tuple.TupleOffset = 0;
+ 
+-  if (pcmcia_get_first_tuple(handle, &tuple))
+-    goto onerror;
+-  if (pcmcia_get_tuple_data(handle, &tuple))
+-    goto onerror;
+-  if (pcmcia_parse_tuple(handle, &tuple, &parse))
+-    goto onerror;
++  if(pcmcia_get_first_tuple(link, &tuple)) goto onerror;
++  if(pcmcia_get_tuple_data(link, &tuple)) goto onerror;
++  if(pcmcia_parse_tuple(link, &tuple, &parse)) goto onerror;
+ 
+   link->conf.ConfigBase = parse.config.base;
+   link->conf.Present = parse.config.rmask[0];
+ 
+-  link->state |= DEV_CONFIG;
+-
+-  if (pcmcia_get_configuration_info(handle, &conf))
+-    goto onerror;
+-
+-  link->conf.Vcc = conf.Vcc;
++  if(pcmcia_get_configuration_info(link, &conf)) goto onerror;
+ 
+   /*
+      The Configuration table consists of a series of configuration table
+@@ -194,15 +138,9 @@ static void cf_config(dev_link_t * link)
+ 
+   tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+ 
+-  if (pcmcia_get_first_tuple(handle, &tuple))
+-    goto onerror;
+-
+-  if (pcmcia_get_tuple_data(handle, &tuple) != CS_SUCCESS)
+-    goto onerror;
+-
+-  if (pcmcia_parse_tuple(handle, &tuple, &parse) != CS_SUCCESS)
+-    goto onerror;
+-
++  if(pcmcia_get_first_tuple(link, &tuple)) goto onerror;
++  if (pcmcia_get_tuple_data(link, &tuple) != CS_SUCCESS ||
++	pcmcia_parse_tuple(link, &tuple, &parse) != CS_SUCCESS) goto onerror;
+ 
+   link->conf.ConfigIndex = cfg->index;
+ 
+@@ -237,19 +175,18 @@ static void cf_config(dev_link_t * link)
+       link->io.NumPorts2 = io->win[1].len;
+     }
+ 
+-    if (pcmcia_request_io(link->handle, &link->io)
++    if (pcmcia_request_io(link, &link->io)
+         != CS_SUCCESS) {
+-      pcmcia_release_io(link->handle, &link->io);
+       printk("Request IO Error !!\n");
+       goto onerror;
+     }
+   }
+ 
+   if (link->conf.Attributes & CONF_ENABLE_IRQ)
+-    if (pcmcia_request_irq(link->handle, &link->irq))
++    if (pcmcia_request_irq(link, &link->irq))
+       goto onerror;
+ 
+-  if (pcmcia_request_configuration(link->handle, &link->conf))
++  if (pcmcia_request_configuration(link, &link->conf))
+     goto onerror;
+ 
+   cardp.irq = link->irq.AssignedIRQ;
+@@ -271,97 +208,40 @@ static void cf_config(dev_link_t * link)
+ 
+   strcpy(dev->node.dev_name, cardp.eth_dev->name);
+   dev->node.major = dev->node.minor = 0;
+-  link->dev = &dev->node;
++  link->dev_node = &dev->node;
+ 
+-  link->state &= ~DEV_CONFIG_PENDING;
+-  return;
++  return 0;
+ 
+ onerror:
+   printk("card configuration failed...calling cf_release function\n");
+-  cf_release((u32) link);
+-  link->state &= ~DEV_CONFIG_PENDING;
++  mv8385_cf_release(link);
+   cardp.flag = 1;
++  return -ENODEV;
+ 
+ } /* cf_config */
+ 
+ 
+ /** 
+- *  @brief CF BUS driver Event handler
+- *  @param event     event id
+- *  @param priority  event priority
+- *  @param args      pointer to event_callback_args_t
+- *  @return 	     0 
+- */
+-static int cf_event(event_t event, int priority, event_callback_args_t *args)
+-{
+-  dev_link_t *link = args->client_data;
+-  if_pcmcia_info_t *dev = link->priv;
+-
+-  switch (event) {
+-  case CS_EVENT_CARD_INSERTION:
+-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+-#ifdef LINUX_2_4
+-    dev->bus = args->bus;
+-#endif
+-    cf_config(link);
+-    break;
+-
+-  case CS_EVENT_CARD_REMOVAL:
+-    link->state &= ~DEV_PRESENT;
+-    printk("card removal event detected\n");
+-    if (link->state & DEV_CONFIG) {
+-      ((if_pcmcia_info_t *) link->priv)->stop = 1;
+-      printk("Before calling release function\n");
+-#ifdef LINUX_2_4
+-#define REMOVE_TIMEOUT		(HZ/20)
+-      mod_timer(&link->release, jiffies + REMOVE_TIMEOUT);
+-#else
+-      cf_detach(link);
+-#endif
+-      printk("After calling release function\n");
+-    }
+-    break;
+-  case CS_EVENT_CARD_RESET:
+-    if (link->state & DEV_CONFIG) {
+-      pcmcia_request_configuration(link->handle, &link->conf);
+-    }
+-    dev->stop = 0;
+-    break;
+-  }
+-
+-  return 0;
+-}       /* cf_event */
+-
+-/** 
+  *  @brief attach CF BUS driver 
+  *  @return 	     pointer to dev_link_t
+  */
+ 
+-static dev_link_t *cf_attach(void)
++static int mv8385_cf_probe(struct pcmcia_device *link)
+ {
+   u8 i; 
+-  int status;
+   if_pcmcia_info_t *ifinfo;
+-  dev_link_t *link;
+-  client_reg_t client_reg;
+ 
+   printk("Entering cf_attach()\n");
+ 
+   /* Allocate space for PCMCIA information */
+   if (!(ifinfo = kmalloc(sizeof(if_pcmcia_info_t), GFP_KERNEL))) {
+-    return NULL;
++    return -ENOMEM;
+   }
+ 
+   memset(ifinfo, 0, sizeof(if_pcmcia_info_t));
+-  link = &ifinfo->link;
++  ifinfo->p_dev = link;
+   link->priv = ifinfo;
+ 
+-#ifdef LINUX_2_4
+-  init_timer(&link->release);
+-  link->release.function = &cf_release;
+-  link->release.data = (ulong) link;
+-#endif
+-
+   link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+   link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_LEVEL_ID;
+   
+@@ -380,38 +260,13 @@ static dev_link_t *cf_attach(void)
+   link->irq.Handler = NULL;
+ 
+   link->conf.Attributes = 0;
+-#define VCC_VALUE	50
+-  link->conf.Vcc = VCC_VALUE;
+-  link->conf.Vpp1 = 0;
+-  link->conf.Vpp2 = 0;
++  link->conf.Vpp = 0;
+   link->conf.IntType = INT_MEMORY_AND_IO;
+   link->conf.ConfigIndex = 1;
+   link->conf.Present = PRESENT_OPTION;
+ 
+-  link->next = dev_list;
+-  dev_list = link;
+-  client_reg.dev_info = &cfio_dev_info;
+-  client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
+-  client_reg.EventMask = CS_EVENT_CARD_INSERTION |
+-      CS_EVENT_CARD_REMOVAL | CS_EVENT_CARD_RESET;
+-  client_reg.event_handler = &cf_event;
+-  client_reg.event_callback_args.client_data = link;
+-  client_reg.Version = CF_VERSION;
+-
+-  printk("Before registering the client\n");
+-
+-  if ((status = pcmcia_register_client(&link->handle,
+-           &client_reg)) != CS_SUCCESS) {
+-    printk("Registering the client failed\n");
+-    CS_ERROR(link->handle, RegisterClient, status);
+-    cf_detach(link);
+-    return NULL;
+-  }
+-
+-  printk("Leaving cf_attach()\n");
+-
+-  return link;
+-}       /* cf_attach */
++  return mv8385_cf_config(link);
++}       /* cf_probe */
+ 
+ 
+ #ifndef LINUX_2_4
+@@ -428,9 +283,8 @@ static struct pcmcia_driver cfio_cs_driv
+ 	.drv		= {
+ 		.name	= "mcf25"
+ 	},
+-	.attach		= cf_attach,
+-	.detach		= cf_detach,
+-	.event		= cf_event,
++	.probe		= mv8385_cf_probe,
++	.remove		= mv8385_cf_detach,
+ 	.id_table	= cfio_ids,
+ };
+ #endif
+@@ -449,28 +303,11 @@ static struct pcmcia_driver cfio_cs_driv
+ u32 *register_cf_driver(cf_notifier_fn_add add, 
+ 			cf_notifier_fn_remove remove, void *arg)
+ {
+-#ifdef LINUX_2_4
+-  servinfo_t serv;
+-#endif
+-
+   cardp.add = add;
+   cardp.remove = remove;
+   cardp.host_int_mask = 0;
+-
+-#ifdef LINUX_2_4
+-  pcmcia_get_card_services_info(&serv);
+-
+-  if (serv.Revision != CS_RELEASE_CODE) {
+-    return NULL;
+-  }
+-#endif
+-
+   printk("Before register driver\n");
+-#ifdef LINUX_2_4
+-  register_pccard_driver(&cfio_dev_info, &cf_attach, &cf_detach);
+-#else
+   pcmcia_register_driver(&cfio_cs_driver);
+-#endif
+   printk("After register driver\n");
+ 
+   return (u32 *) &cardp;
+@@ -482,22 +319,7 @@ u32 *register_cf_driver(cf_notifier_fn_a
+  */
+ void unregister_cf_driver( void )
+ {
+-
+-#ifdef LINUX_2_4
+-  unregister_pccard_driver(&cfio_dev_info);
+-#else
+   pcmcia_unregister_driver(&cfio_cs_driver);
+-#endif
+-
+-  cf_detach(dev_list);
+-
+-  while (dev_list != NULL) {
+-#ifdef LINUX_2_4
+-    del_timer(&dev_list->release);
+-#endif
+-    if (dev_list->state & DEV_CONFIG)
+-      cf_release((u32) dev_list);
+-  }
+ }
+ 
+ 
+@@ -508,6 +330,8 @@ void unregister_cf_driver( void )
+  */
+ s16 cfio_read_cfg_reg(void* priv)
+ {
++ if_pcmcia_info_t *ifinfo = (if_pcmcia_info_t *)priv;
++  
+   conf_reg_t reg;
+ 
+   reg.Function  = 0;
+@@ -515,7 +339,7 @@ s16 cfio_read_cfg_reg(void* priv)
+   reg.Offset    = 0;
+   reg.Value     = 0;
+ 
+-  pcmcia_access_configuration_register(dev_list->handle, &reg);
++  pcmcia_access_configuration_register(ifinfo->p_dev, &reg);
+   return 0;
+ }
+ 
+Index: src_cf8385/io/mcf/cfio_io.h
+===================================================================
+--- src_cf8385.orig/io/mcf/cfio_io.h
++++ src_cf8385/io/mcf/cfio_io.h
+@@ -82,7 +82,6 @@ typedef void *  (*cf_notifier_fn_add) (s
+ typedef int (*cf_notifier_fn_remove) (struct cf_card_rec *);
+ 
+ extern dev_info_t cfio_dev_info;
+-extern dev_link_t *dev_list;
+ 
+ extern struct cf_card_rec cardp;
+ s16 cfio_read_cfg_reg(void *priv);
+Index: src_cf8385/if/if_mcf/if_cf.c
+===================================================================
+--- src_cf8385.orig/if/if_mcf/if_cf.c
++++ src_cf8385/if/if_mcf/if_cf.c
+@@ -32,11 +32,9 @@ Change log:
+   do { \
+     tuple.DesiredTuple = X; \
+     \
+-    if (!handle) \
++    if (pcmcia_get_first_tuple((&cisinfo), &tuple)) \
+       goto error; \
+-    if (pcmcia_get_first_tuple(handle, &tuple)) \
+-      goto error; \
+-    if (pcmcia_get_tuple_data(handle, &tuple)) \
++    if (pcmcia_get_tuple_data((&cisinfo), &tuple)) \
+       goto error; \
+     \
+     cisbuf[ofs++] = tuple.TupleCode; \
+@@ -48,7 +46,7 @@ Change log:
+ int   *register_cf_driver(cf_notifier_fn_add ,cf_notifier_fn_remove , void *);
+ void  unregister_cf_driver(void);
+ 
+-static dev_link_t cisinfo;
++static struct pcmcia_device cisinfo;
+ 
+ static u16 int_cause = 0;
+ 
+@@ -771,7 +769,6 @@ int sbi_host_to_card(wlan_private *priv,
+ int sbi_get_cis_info(wlan_private *priv)
+ {
+   	wlan_adapter *Adapter = priv->adapter;
+-  	client_handle_t handle = cisinfo.handle;
+   	tuple_t tuple;
+   	char buf[64], cisbuf[512];
+   	int ofs=0, count=6;
+@@ -793,9 +790,9 @@ int sbi_get_cis_info(wlan_private *priv)
+ 
+   	do 
+   	{
+-		if (pcmcia_get_next_tuple(handle, &tuple))
++		if (pcmcia_get_next_tuple((&cisinfo), &tuple))
+       			goto error;
+-		if (pcmcia_get_tuple_data(handle, &tuple))
++		if (pcmcia_get_tuple_data((&cisinfo), &tuple))
+       			goto error;
+   
+     		cisbuf[ofs++] = tuple.TupleCode;
+Index: src_cf8385/wlan/wlan_fw.c
+===================================================================
+--- src_cf8385.orig/wlan/wlan_fw.c
++++ src_cf8385/wlan/wlan_fw.c
+@@ -21,11 +21,11 @@ Change log:
+ ********************************************************/
+ 
+ 
+-u8 *helper_name=NULL;
+-u8 *fw_name=NULL;
++static char *helper_name=NULL;
++static char *fw_name=NULL;
+ 
+-MODULE_PARM( helper_name, "s");
+-MODULE_PARM( fw_name, "s" );
++module_param( helper_name, charp, 0);
++module_param( fw_name, charp, 0);
+ 
+ 
+ /********************************************************
diff --git a/packages/wifistix/wifistix-modules/bad-cast.patch b/packages/wifistix/wifistix-modules/bad-cast.patch
new file mode 100644
index 0000000000..5f4f48c27b
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/bad-cast.patch
@@ -0,0 +1,13 @@
+Index: src_cf8385/wlan/wlan_wext.c
+===================================================================
+--- src_cf8385.orig/wlan/wlan_wext.c
++++ src_cf8385/wlan/wlan_wext.c
+@@ -1023,7 +1023,7 @@ static int wlan_txcontrol(wlan_private *
+ 	   	return -EFAULT;
+ 	     }
+ 	     copy_from_user(&data,wrq->u.data.pointer,sizeof(int));
+-	     (u32)Adapter->PktTxCtrl = data;
++	     Adapter->PktTxCtrl = (u32)data;
+ 	}
+ 
+ 	wrq->u.data.length = 1;
diff --git a/packages/wifistix/wifistix-modules/fix-essid-truncation.patch b/packages/wifistix/wifistix-modules/fix-essid-truncation.patch
new file mode 100644
index 0000000000..c9185eab03
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/fix-essid-truncation.patch
@@ -0,0 +1,13 @@
+Index: src_cf8385/wlan/wlan_join.c
+===================================================================
+--- src_cf8385.orig/wlan/wlan_join.c
++++ src_cf8385/wlan/wlan_join.c
+@@ -213,7 +213,7 @@ int wlan_set_essid(struct net_device* de
+     } else {
+         /* Set the SSID */
+         memcpy(reqSSID.Ssid, extra, dwrq->length);
+-        reqSSID.SsidLength = dwrq->length - 1;
++        reqSSID.SsidLength = dwrq->length;
+     }
+ 
+     PRINTM(INFO, "Requested new SSID = %s\n",
diff --git a/packages/wifistix/wifistix-modules/install-properly.patch b/packages/wifistix/wifistix-modules/install-properly.patch
new file mode 100644
index 0000000000..ebc00ed867
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/install-properly.patch
@@ -0,0 +1,14 @@
+Index: src_cf8385/Makefile
+===================================================================
+--- src_cf8385.orig/Makefile
++++ src_cf8385/Makefile
+@@ -2014,8 +2014,7 @@ endif
+ 
+ ifeq ($(CONFIG_CF),y)
+ ifeq ($(KVER),2.6)
+-				cp -f cfio.$(MODEXT) $(INSTALLDIR)/
+-				cp -f mcf25.$(MODEXT) $(INSTALLDIR)/
++				$(MAKE) -C $(KERNELDIR) M=$(PWD) INSTALL_MOD_PATH="$(INSTALL_MOD_PATH)" modules_install
+ else
+ 				cp -f io/mcf/cfio.$(MODEXT) $(INSTALLDIR)/
+ 				$(LD) -r -o $(INSTALLDIR)/mcf25.$(MODEXT) cf8xxx.$(MODEXT)
diff --git a/packages/wifistix/wifistix-modules/marvell-devicename.patch b/packages/wifistix/wifistix-modules/marvell-devicename.patch
new file mode 100644
index 0000000000..62ebe89883
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/marvell-devicename.patch
@@ -0,0 +1,11 @@
+--- src_cf8385-orig/wlan/wlan_main.c	2006-05-06 17:24:51.000000000 -0700
++++ src_cf8385/wlan/wlan_main.c	2006-05-06 17:26:14.000000000 -0700
+@@ -873,7 +873,7 @@
+ #ifdef LINUX_2_4
+ 	if (!(dev = init_etherdev(dev, sizeof(wlan_private)))) {
+ #else
+-	if (!(dev = alloc_etherdev(sizeof(wlan_private)))) {
++	if (!(dev = alloc_netdev(sizeof(wlan_private), "wlan%d", ether_setup))) {
+ #endif
+ 		PRINTM(MSG, "Init ethernet device failed!\n");
+ 		return NULL;
diff --git a/packages/wifistix/wifistix-modules/marvell-devicetable.patch b/packages/wifistix/wifistix-modules/marvell-devicetable.patch
new file mode 100644
index 0000000000..5d726a582b
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/marvell-devicetable.patch
@@ -0,0 +1,25 @@
+--- src_cf8385/io/mcf/cf_io-orig.c	2006-04-29 16:26:16.000000000 -0700
++++ src_cf8385/io/mcf/cf_io.c	2006-04-29 16:32:59.000000000 -0700
+@@ -415,6 +415,14 @@
+ 
+ 
+ #ifndef LINUX_2_4
++static struct pcmcia_device_id cfio_ids[] = {
++	PCMCIA_DEVICE_MANF_CARD(0x02df, 0x8103),
++	PCMCIA_DEVICE_PROD_ID12("Marvell",	"88W8300 802.11g PC Card",
++				0xE86284BA,	0x8C78E0CD),
++	PCMCIA_DEVICE_NULL,
++};
++MODULE_DEVICE_TABLE(pcmcia, cfio_ids);
++
+ static struct pcmcia_driver cfio_cs_driver = {
+ 	.owner		= THIS_MODULE,
+ 	.drv		= {
+@@ -423,6 +431,7 @@
+ 	.attach		= cf_attach,
+ 	.detach		= cf_detach,
+ 	.event		= cf_event,
++	.id_table	= cfio_ids,
+ };
+ #endif
+ 
diff --git a/packages/wifistix/wifistix-modules/marvell-gumstix.patch b/packages/wifistix/wifistix-modules/marvell-gumstix.patch
new file mode 100644
index 0000000000..5c336e3fa1
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/marvell-gumstix.patch
@@ -0,0 +1,24 @@
+--- src_cf8385/Makefile	2006-03-06 16:15:36.000000000 -0800
++++ /tmp/Makefile	2006-04-28 15:45:26.000000000 -0700
+@@ -36,9 +36,6 @@
+ # Valid options for OMAP1510: 15, 16
+ KERNEL_WE=16
+ 
+-CC=		$(CROSS)gcc
+-LD=		$(CROSS)ld
+-
+ BACKUP=		/root/backup
+ YMD=		`date +%Y%m%d%H%M`
+ 
+@@ -1095,6 +1092,11 @@
+ 		CROSS=$(TOOLPATH_iMX21)/arm-linux-
+ 	endif
+ endif
++ifeq ($(CONFIG_GUMSTIX), y)
++	INSTALLDIR=$(TARGET_DIR)
++	TOOLPATH=$(STAGING_DIR)/bin
++	CFLAGS += -DNOMEMCOPY
++endif
+ ifeq ($(CONFIG_BULVERDE), y)
+ 	INSTALLDIR=$(BULVERDE_DIR)
+ 	ifeq ($(CONFIG_SD),y)
diff --git a/packages/wifistix/wifistix-modules/no-more-config-h.patch b/packages/wifistix/wifistix-modules/no-more-config-h.patch
new file mode 100644
index 0000000000..8bd7a14e58
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/no-more-config-h.patch
@@ -0,0 +1,24 @@
+Index: src_cf8385/io/mcf/cfio_io.h
+===================================================================
+--- src_cf8385.orig/io/mcf/cfio_io.h
++++ src_cf8385/io/mcf/cfio_io.h
+@@ -51,7 +51,6 @@ Change log:
+ #include <linux/skbuff.h>
+ #include <linux/if_arp.h>
+ #include <linux/ioport.h>
+-#include <linux/config.h>
+ 
+ #include <pcmcia/version.h>
+ #include <pcmcia/cs_types.h>
+Index: src_cf8385/os/linux/os_headers.h
+===================================================================
+--- src_cf8385.orig/os/linux/os_headers.h
++++ src_cf8385/os/linux/os_headers.h
+@@ -32,7 +32,6 @@
+ #include        <linux/proc_fs.h>
+ #include	<linux/ptrace.h>
+ #include	<linux/string.h>
+-#include	<linux/config.h>
+ #include	<linux/ioport.h>
+ 
+ 
diff --git a/packages/wifistix/wifistix-modules/realtime-kernel.patch b/packages/wifistix/wifistix-modules/realtime-kernel.patch
new file mode 100644
index 0000000000..49a86c29de
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/realtime-kernel.patch
@@ -0,0 +1,25 @@
+Index: src_cf8385/if/if_mcf/if_cf.c
+===================================================================
+--- src_cf8385.orig/if/if_mcf/if_cf.c
++++ src_cf8385/if/if_mcf/if_cf.c
+@@ -238,10 +238,9 @@ static void init_cf_addr(wlan_private *p
+  *  @brief This function is interrupt handler.
+  *  @param iqr		interrupt number
+  *  @param dev_id	pointer to net_device structure
+- *  @param regs		pointer to pt_regs structure
+  *  @return 	   	n/a
+  */
+-static IRQ_RET_TYPE cf_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++static IRQ_RET_TYPE cf_interrupt(int irq, void *dev_id)
+ {
+   	struct net_device *dev = dev_id;
+   	wlan_private *priv    = (wlan_private *) dev->priv;
+@@ -710,7 +709,7 @@ int sbi_register_dev(wlan_private * priv
+ 
+   	PRINTM(INFO, "IRQ %d\n", cardp.irq);
+ 
+-  	ret = request_irq(cardp.irq, cf_interrupt, SA_SHIRQ, 
++  	ret = request_irq(cardp.irq, cf_interrupt, IRQF_SHARED, 
+       				"cf_irq", priv->wlan_dev.netdev );
+            
+   	if (ret != 0)
diff --git a/packages/wifistix/wifistix-modules/sbi-no-inline.patch b/packages/wifistix/wifistix-modules/sbi-no-inline.patch
new file mode 100644
index 0000000000..204ebc78b5
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/sbi-no-inline.patch
@@ -0,0 +1,13 @@
+--- src_cf8385/wlan/sbi.h
++++ src_cf8385/wlan/sbi.h
+@@ -92,8 +92,8 @@
+ 							u16 npayload);
+ int sbi_enable_host_int(wlan_private *);
+ 
+-inline int sbi_exit_deep_sleep(wlan_private *);
+-inline int sbi_reset_deepsleep_wakeup(wlan_private *);
++int sbi_exit_deep_sleep(wlan_private *);
++int sbi_reset_deepsleep_wakeup(wlan_private *);
+ 
+ #ifdef ENABLE_PM
+ inline int sbi_suspend(wlan_private *);
diff --git a/packages/wifistix/wifistix-modules/struct-changes.patch b/packages/wifistix/wifistix-modules/struct-changes.patch
new file mode 100644
index 0000000000..d935796900
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/struct-changes.patch
@@ -0,0 +1,13 @@
+Index: src_cf8385/wlan/wlan_main.c
+===================================================================
+--- src_cf8385.orig/wlan/wlan_main.c
++++ src_cf8385/wlan/wlan_main.c
+@@ -912,7 +912,7 @@ static wlan_private *wlan_add_card(void 
+ 	dev->watchdog_timeo = WLAN_WATCHDOG_TIMEOUT;
+ 
+ #ifdef	WIRELESS_EXT
+-	dev->get_wireless_stats = wlan_get_wireless_stats;
++	wlan_handler_def.get_wireless_stats = wlan_get_wireless_stats;
+ 	dev->wireless_handlers = (struct iw_handler_def *) &wlan_handler_def;
+ #endif
+ #endif  /* linux */	
diff --git a/packages/wifistix/wifistix-modules/wifistix.conf b/packages/wifistix/wifistix-modules/wifistix.conf
new file mode 100644
index 0000000000..117d8a2281
--- /dev/null
+++ b/packages/wifistix/wifistix-modules/wifistix.conf
@@ -0,0 +1,4 @@
+install pcmcia /sbin/modprobe --ignore-install pcmcia && modprobe pxa2xx-cs
+
+alias wlan0 mcf25
+
diff --git a/packages/wifistix/wifistix-modules_5.0.16.p0.bb b/packages/wifistix/wifistix-modules_5.0.16.p0.bb
new file mode 100644
index 0000000000..923f24e27a
--- /dev/null
+++ b/packages/wifistix/wifistix-modules_5.0.16.p0.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "Linux Driver for Marvel 88W8385 802.11b/g Wifi Module used in Gumstix daughtercards"
+SECTION = "base"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.gumstix.com"
+LICENSE = "GPL"
+RDEPENDS = "kernel (${KERNEL_VERSION})"
+DEPENDS = "virtual/kernel"
+PR = "r0"
+
+SRC_URI = "http://files.gumstix.com/cf8385-5.0.16.p0-26306.tbz \
+			file://wifistix.conf \
+			file://marvell-devicename.patch;patch=1 \
+			file://marvell-devicetable.patch;patch=1 \
+			file://marvell-gumstix.patch;patch=1 \
+			file://sbi-no-inline.patch;patch=1 \
+			file://2.6.17-new-pcmcia-layer.patch;patch=1 \
+			file://bad-cast.patch;patch=1 \
+			file://struct-changes.patch;patch=1 \
+			file://no-more-config-h.patch;patch=1 \
+			file://realtime-kernel.patch;patch=1 \
+			file://install-properly.patch;patch=1 \
+			file://fix-essid-truncation.patch;patch=1"
+
+S = "${WORKDIR}/src_cf8385"
+
+inherit module-base
+
+EXTRA_OEMAKE = 'CONFIG_GUMSTIX=y CONFIG_DEBUG=n KVER=2.6 \
+                KERNELDIR="${KERNEL_SOURCE}" ARCH="${TARGET_ARCH}" \
+                CC="${KERNEL_CC}" EXTRA_CFLAGS="${CFLAGS}" \
+                INSTALL_MOD_PATH="${D}"'
+
+do_compile() {	
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake
+}
+
+do_install() {	
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake install
+
+	install -m 0755 -d ${D}${sysconfdir}/modprobe.d
+	install -m 0644 ${WORKDIR}/wifistix.conf ${D}${sysconfdir}/modprobe.d/wifistix.conf
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${base_libdir}/modules/"
+FILES_${PN} += "${sysconfdir}/modprobe.d/"
+CONFFILES_${PN} = "${sysconfdir}/modprobe.d/wifistix.conf"
+
diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch
deleted file mode 100644
index b143eedff3..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.2.0/kdrive-imageon.patch
+++ /dev/null
@@ -1,9079 +0,0 @@
-# Author: Manuel Teira <manuel.teira@telefonica.net> (sirfred in #oe)
-# Description: New driver for the Imageon ATI Card. Implementing:
-# -Hardware solid fills
-# -Hardware bitblt
-# -Hardware cursors
-# -XV Extension
-# -Internal and External Imageon offscreen memory support
-# -Hardware RandR rotation (without using a shadow framebuffer)
-# -Support for RandR mode changing
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
-Index: xorg-server-1.2.0/configure.ac
-===================================================================
---- xorg-server-1.2.0.orig/configure.ac	2007-06-17 10:49:00.000000000 +0200
-+++ xorg-server-1.2.0/configure.ac	2007-06-17 10:49:02.000000000 +0200
-@@ -444,6 +444,7 @@
- AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
- AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
- AC_ARG_ENABLE(xsdl,           AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto])
-+AC_ARG_ENABLE(imageon,        AS_HELP_STRING([--enable-imageon], [Build the kdrive Ximageon server (default: no)]), [KDRIVEIMAGEON=$enableval], [KDRIVEIMAGEON=no])
- dnl xprint
- AC_ARG_ENABLE(freetype,       AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no])
- AC_ARG_WITH(freetype-config,  AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto)
-@@ -1581,6 +1582,11 @@
- AC_SUBST([XSDL_INCS])
- 
- 
-+AM_CONDITIONAL(KDRIVEIMAGEON, [test "x$KDRIVEIMAGEON" = xyes])
-+if test "x$KDRIVEIMAGEON" = xyes; then
-+        AC_DEFINE(KDRIVEIMAGEON, 1, [Build Ximageon server])
-+fi
-+
- dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
- AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
- AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
-@@ -1806,6 +1812,7 @@
- hw/kdrive/epson/Makefile
- hw/kdrive/fake/Makefile
- hw/kdrive/fbdev/Makefile
-+hw/kdrive/imageon/Makefile
- hw/kdrive/i810/Makefile
- hw/kdrive/linux/Makefile
- hw/kdrive/mach64/Makefile
-Index: xorg-server-1.2.0/hw/kdrive/Makefile.am
-===================================================================
---- xorg-server-1.2.0.orig/hw/kdrive/Makefile.am	2007-06-17 10:49:00.000000000 +0200
-+++ xorg-server-1.2.0/hw/kdrive/Makefile.am	2007-06-17 11:03:40.000000000 +0200
-@@ -1,24 +1,15 @@
--if KDRIVEVESA
--VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
--               smi via
--endif
--
- if KDRIVEFBDEV
--FBDEV_SUBDIRS = fbdev epson
--endif
--
--if XSDLSERVER
--XSDL_SUBDIRS = sdl
--endif
--
--if XEPHYR
--XEPHYR_SUBDIRS = ephyr
-+FBDEV_SUBDIRS = fbdev
- endif
- 
- if KDRIVELINUX
- LINUX_SUBDIRS = linux
- endif
- 
-+if KDRIVEIMAGEON
-+IMAGEON_SUBDIRS = imageon
-+endif
-+
- SUBDIRS =			\
- 	src			\
- 	$(LINUX_SUBDIRS)	\
-@@ -26,7 +17,7 @@
- 	$(FBDEV_SUBDIRS)	\
- 	$(VESA_SUBDIRS)		\
- 	$(XEPHYR_SUBDIRS)       \
--	fake
-+        $(IMAGEON_SUBDIRS)
- 
- DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
-                smi via fbdev sdl ephyr src linux fake sis300
-Index: xorg-server-1.2.0/hw/kdrive/imageon/Makefile.am
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/Makefile.am	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,47 @@
-+if KDRIVEFBDEV
-+FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev
-+FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a
-+endif
-+
-+INCLUDES = 					\
-+	@KDRIVE_INCS@				\
-+	$(FBDEV_INCLUDES)			\
-+	@KDRIVE_CFLAGS@
-+
-+bin_PROGRAMS = Ximageon
-+
-+if TSLIB
-+TSLIB_FLAG = -lts
-+endif
-+
-+noinst_LIBRARIES = libimageon.a
-+
-+libimageon_a_SOURCES = 	  \
-+	imageon.h	  \
-+	imageon_regs.h    \
-+	imageon_const.h   \
-+	imageon.c	  \
-+	imageon_cursor.c  \
-+	imageon_draw.c	  \
-+	imageon_support.c \
-+	imageon_video.c
-+
-+
-+
-+Ximageon_SOURCES = \
-+	imageon_stub.c
-+
-+W100_LIBS =				\
-+	libimageon.a 			\
-+	$(FBDEV_LIBS)			\
-+	@KDRIVE_LIBS@
-+
-+Ximageon_LDADD = \
-+	$(W100_LIBS)			\
-+	@XSERVER_LIBS@			\
-+	$(TSLIB_FLAG)
-+
-+
-+Ximageon_DEPENDENCIES =			\
-+        libimageon.a                    \
-+        $(FBDEV_LIBS) 
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon.c	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,606 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+#include "imageon.h"
-+#include "imageon_regs.h"
-+#include "imageon_support.h"
-+
-+W100CardEntry w100_cards[] = {
-+    {0x1002, 0x5644, 0,             "ATI Imageon 3200"},
-+    {0x1002, 0x5741, W100XVSupport, "ATI Imageon 100"},
-+    {0x1002, 0x5744, 0,             "ATI Imageon 3220"},
-+    {0,      0,      0,             NULL}
-+};
-+
-+W100ModeSpec w100_modes[] = {
-+    {800, 600, 16, W100_EXTMEM, FALSE},
-+    {640, 480, 16, W100_EXTMEM, FALSE},
-+    {320, 240, 16, W100_INTMEM, FALSE},
-+    {  0,   0,  0,           0, FALSE}    
-+};
-+
-+W100StartupInfo w100StartupInfo;
-+
-+extern void (*tslib_transform_coords)(long *x, long *y, void *closure);
-+extern void *tslib_transform_closure;
-+
-+static void
-+W100Startup(W100CardInfo *w100c)
-+{
-+    int i;
-+    DBG_IMAGEON(("--W100Startup\n"));
-+    W100ModeSpec *modes;
-+    /* Take the current graphics mode */
-+    if (!W100GetFbMode(w100c, &w100StartupInfo.mode)) {
-+        ErrorF("(E) Unable to get current mode\n");
-+    }
-+    w100StartupInfo.randr = W100GetRotation(w100c);
-+    w100StartupInfo.portrait = w100StartupInfo.mode.width < w100StartupInfo.mode.height;
-+
-+    /* Test the valid modes  */
-+    for (modes = w100_modes; modes->width; modes++) {
-+        modes->supported = W100CheckFbMode(w100c, modes);
-+    }
-+
-+    DBG_IMAGEON(("Startup Mode: %dx%d@%d, rot: %d, portrait: %s\n", 
-+                 w100StartupInfo.mode.width,
-+                 w100StartupInfo.mode.height,
-+                 w100StartupInfo.mode.bpp,
-+                 w100StartupInfo.randr,
-+                 w100StartupInfo.portrait ? "Yes" : "No"));
-+
-+    /* Tell the kernel to never switch off external memory  */
-+    W100SysFsSet(w100c, W100_SYSFS_BASE "extmem", "1");
-+
-+    /* Disable framebuffer accel */
-+    W100SysFsSet(w100c, W100_SYSFS_BASE "accel", "0");
-+
-+    /* Enable fastsysclk */
-+    W100SysFsSet(w100c, W100_SYSFS_BASE "fastpllclk", "1");
-+
-+}
-+
-+
-+static Bool
-+W100Map(KdCardInfo * card, W100CardInfo *w100c)
-+{
-+    DBG_IMAGEON(("--W100Map\n"));
-+    w100c->mem_base = (CARD8 *) KdMapDevice(W100_MEM_BASE, W100_MEM_SIZE);
-+
-+    if (w100c->mem_base == NULL) {
-+        return FALSE;
-+    }
-+
-+    w100c->reg_base = w100c->mem_base + W100_REG_OFFSET;
-+
-+    /* 
-+     * It doesn't matter mapping all the area as registers.
-+     * There's only difference when HAVE_ASM_MTRR_H is defined.
-+     * So, this call is doing nothing.
-+     */
-+    KdSetMappedMode(W100_MEM_BASE, W100_MEM_SIZE, KD_MAPPED_MODE_REGISTERS);
-+
-+    return TRUE;
-+}
-+
-+static void
-+W100Unmap(KdCardInfo * card, W100CardInfo *w100c)
-+{
-+    DBG_IMAGEON(("--W100Unmap\n"));
-+    if (w100c->mem_base) {
-+        KdResetMappedMode(W100_MEM_BASE, W100_MEM_SIZE, 
-+                          KD_MAPPED_MODE_REGISTERS);
-+        KdUnmapDevice((void *) w100c->mem_base, W100_MEM_SIZE);
-+        w100c->mem_base = w100c->reg_base = 0;
-+    }
-+}
-+
-+static void W100MemSetup(W100CardInfo *w100c)
-+{
-+    int reg_value;
-+    int int_start, int_size;
-+    int ext_start, ext_size;
-+    int i;
-+    DBG_IMAGEON(("--W100MemSetup\n"));
-+
-+    for (i = 0; i < w100c->num_memareas; i++) {
-+        xfree(w100c->memareas[i]);
-+    }
-+    xfree(w100c->memareas);
-+
-+    reg_value = MMIO_IN32(mmMC_FB_LOCATION);
-+    int_start = (reg_value & 0xffff) << 8;
-+    int_size =  (((reg_value >> 16) & 0xffff) - (reg_value & 0xffff)) << 8;
-+    DBG_IMAGEON(("(I) MC_FB_LOCATION: 0x%08x. Start: 0x%08x, size: %d\n",
-+                 reg_value, int_start, int_size));
-+
-+    reg_value = MMIO_IN32(mmMC_EXT_MEM_LOCATION);
-+    ext_start = (reg_value & 0xffff) << 8;
-+    ext_size =  (((reg_value >> 16) & 0xffff) - (reg_value & 0xffff)) << 8;
-+    DBG_IMAGEON(("(I) MC_EXT_MEM_LOCATION: 0x%08x. Start: 0x%08x, size: %d\n",
-+                 reg_value, ext_start, ext_size));
-+
-+    w100c->num_memareas = (ext_size > 0) ? 2 : 1;
-+    w100c->memareas = xcalloc(sizeof(W100MemArea *), w100c->num_memareas);
-+
-+    w100c->memareas[W100_INTMEM] = xcalloc(sizeof(W100MemArea), 1);
-+    w100c->memareas[W100_INTMEM]->priority = KD_VIDMEM_MAXPRIO;
-+    w100c->memareas[W100_INTMEM]->start = (CARD8 *) int_start;
-+    w100c->memareas[W100_INTMEM]->size = int_size;
-+
-+    if (w100c->num_memareas == 2) {
-+        w100c->memareas[W100_EXTMEM] = xcalloc(sizeof(W100MemArea), 1);
-+        w100c->memareas[W100_EXTMEM]->priority = KD_VIDMEM_MINPRIO;
-+        w100c->memareas[W100_EXTMEM]->start = (CARD8 *) ext_start;
-+        w100c->memareas[W100_EXTMEM]->size = ext_size;
-+    }
-+
-+    for (i = 0; i < w100c->num_memareas; i++) {
-+        DBG_IMAGEON(("(I) Memory mapped at 0x%08x(0x%08x), size %d bytes\n",
-+                     W100_CARD2HOST(w100c->memareas[i]->start),
-+                     w100c->memareas[i]->start,
-+                     w100c->memareas[i]->size));
-+    }
-+
-+}
-+
-+static Bool
-+W100CardInit(KdCardInfo * card)
-+{
-+    W100CardInfo *w100c;
-+
-+    W100CardEntry *model = &w100_cards[0];
-+    static Bool initialized = FALSE;
-+
-+    DBG_IMAGEON(("--W100CardInit\n"));
-+
-+    w100c = xcalloc(sizeof(W100CardInfo), 1);
-+    if (w100c == NULL)
-+        return FALSE;
-+
-+    if (!fbdevInitialize(card, &w100c->fbdev)) {
-+        return FALSE;
-+    }
-+
-+    if (!W100Map(card, w100c)) {
-+        xfree(w100c);
-+        return FALSE;
-+    }
-+    card->driver = w100c;
-+
-+    while (model->name) {
-+        if (model->device == card->attr.deviceID) {
-+            w100c->card_id = model;
-+            break;
-+        }
-+        model++;
-+    }
-+
-+    ErrorF("(I) Using ATI card: %s\n", w100c->card_id->name);
-+
-+    if (!initialized) {
-+        initialized = TRUE;
-+        W100Startup(w100c);
-+    }
-+
-+    w100c->hw_window.mode  = W100GetModeSpec(w100c, &w100StartupInfo.mode);
-+    w100c->hw_window.randr = w100StartupInfo.randr;
-+
-+    tslib_transform_closure = w100c;
-+    tslib_transform_coords = W100TransformTsLibCoordinates;
-+    return TRUE;
-+}
-+
-+
-+static void
-+W100CardFini(KdCardInfo * card)
-+{
-+    W100CardInfo *w100c = (W100CardInfo *) card->driver;
-+
-+    DBG_IMAGEON(("--W100CardFini\n"));
-+    W100Unmap(card, w100c);
-+    fbdevCardFini(card);
-+}
-+
-+static void
-+W100Setup(KdScreenInfo *screen)
-+{
-+    W100CardInfo(screen);
-+    W100MemArea *mem;
-+    KdMouseMatrix m;
-+    int fb_size, i;
-+
-+    DBG_IMAGEON(("--W100Setup\n"));
-+
-+    /* Adjust mode */
-+    w100c->hw_window.width = screen->width;
-+    w100c->hw_window.height = screen->height;
-+    w100c->hw_window.bpp =  screen->fb[0].bitsPerPixel;
-+    W100SetupGraphicWindow(w100c);
-+
-+    /* Get some register values */
-+    w100c->regs.ENG_CNTL =       MMIO_IN32(mmENG_CNTL);
-+    w100c->regs.VIDEO_CTRL =     MMIO_IN32(mmVIDEO_CTRL);
-+    w100c->regs.GRAPHIC_H_DISP = MMIO_IN32(mmGRAPHIC_H_DISP);
-+    w100c->regs.GRAPHIC_V_DISP = MMIO_IN32(mmGRAPHIC_V_DISP);
-+    w100c->regs.DISP_DEBUG2    = MMIO_IN32(mmDISP_DEBUG2);
-+
-+    W100MemSetup(w100c);
-+
-+    /* Clear the VideoMemAreas set up by the framebuffer initialization */
-+    for (i = 0; i < screen->num_videomem_areas; i++) {
-+        xfree(screen->videomem_areas[i]);
-+    }
-+    xfree(screen->videomem_areas);
-+    
-+    screen->videomem_areas = xcalloc(sizeof(KdVideoMemArea *), 
-+                                     w100c->num_memareas);
-+    screen->num_videomem_areas = w100c->num_memareas;
-+
-+    screen->fb[0].byteStride = screen->width * screen->fb[0].bitsPerPixel / 8;
-+    fb_size = screen->fb[0].byteStride * screen->height;
-+
-+    DBG_IMAGEON(("(I) Framebuffer required size: %d bytes\n", fb_size));
-+    
-+    for (i = 0; i < w100c->num_memareas; i++) {
-+        mem = w100c->memareas[i];
-+        screen->videomem_areas[i] = xcalloc(sizeof(KdVideoMemArea), 1);
-+        screen->videomem_areas[i]->priority = mem->priority;
-+        screen->videomem_areas[i]->base = W100_CARD2HOST(mem->start);
-+        screen->videomem_areas[i]->size = mem->size;
-+        if (w100c->hw_window.mode->fbpool == i) {
-+            DBG_IMAGEON(("(I) FrameBuffer in w100 memzone 0x%08x(0x%08x)\n", 
-+                         W100_CARD2HOST(mem->start), mem->start));
-+            screen->videomem_areas[i]->available_offset = fb_size;
-+            screen->fb[0].frameBuffer = W100_CARD2HOST(mem->start);
-+        } else {
-+            screen->videomem_areas[i]->available_offset = 0;
-+        }
-+        DBG_IMAGEON(("New videomem_area(priority:%d, start:0x%08x, size:%d, available_offset:%d\n",
-+                     screen->videomem_areas[i]->priority,
-+                     screen->videomem_areas[i]->base,
-+                     screen->videomem_areas[i]->size,
-+                     screen->videomem_areas[i]->available_offset));
-+    }
-+
-+
-+    w100c->hw_window.offset = W100_HOST2CARD(screen->fb[0].frameBuffer);
-+
-+    KdComputeMouseMatrix(&m, screen->randr, 
-+                         w100StartupInfo.portrait ? 
-+                         W100_MIN(screen->width, screen->height) :
-+                         W100_MAX(screen->width, screen->height),
-+                         w100StartupInfo.portrait ? 
-+                         W100_MAX(screen->width, screen->height) :
-+                         W100_MIN(screen->width, screen->height));
-+
-+    KdSetMouseMatrix(&m);
-+
-+    DBG_IMAGEON(("Window(width:%d,height:%d,bpp:%d,offset:0x%08x"
-+                 "(0x%08x), randr:%d)\n",
-+                 w100c->hw_window.width,
-+                 w100c->hw_window.height,
-+                 w100c->hw_window.bpp,
-+                 w100c->hw_window.offset,
-+                 screen->fb[0].frameBuffer,
-+                 w100c->hw_window.randr));
-+
-+}
-+
-+static Bool
-+W100ScreenInit(KdScreenInfo * screen)
-+{
-+    W100ScreenInfo *w100s;
-+    W100CardInfo(screen);
-+    Bool success = FALSE;
-+
-+    DBG_IMAGEON(("--W100ScreenInit\n"));
-+    w100s = xcalloc(sizeof(W100ScreenInfo), 1);
-+    if (w100s == NULL)
-+        return FALSE;
-+
-+    w100s->w100c = w100c;
-+    w100s->screen = screen;
-+    screen->driver = w100s;
-+
-+    success = fbdevScreenInitialize(screen, &w100s->fbdev);
-+
-+    if (!success) {
-+        screen->driver = NULL;
-+        xfree(w100s);
-+        return FALSE;
-+    }
-+
-+    W100Setup(screen);
-+
-+    return TRUE;
-+}
-+
-+static void
-+W100ScreenFini(KdScreenInfo * screen)
-+{
-+    W100ScreenInfo *w100s = (W100ScreenInfo *) screen->driver;
-+    DBG_IMAGEON(("--W100ScreenFini\n"));
-+    fbdevScreenFini(screen);
-+    xfree(w100s);
-+    screen->driver = 0;
-+}
-+
-+static Bool
-+W100InitScreen(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+
-+    DBG_IMAGEON(("--W100InitScreen\n"));
-+    if (w100c->card_id->caps & W100XVSupport) {
-+        W100InitVideo(pScreen);
-+    }
-+    return fbdevInitScreen(pScreen);
-+}
-+
-+#ifdef RANDR
-+
-+static Bool W100RandRSetConfig(ScreenPtr pScreen,
-+                               Rotation randr,
-+                               int rate,
-+                               RRScreenSizePtr pSize)
-+{
-+    KdScreenPriv(pScreen);
-+    KdScreenInfo *screen = pScreenPriv->screen;
-+    W100CardInfo(pScreenPriv);
-+    Bool screenEnabled = pScreenPriv->enabled;
-+
-+    DBG_IMAGEON(("--W100RandRSetConfig(randr:%d,pSize:%dx%d)\n",
-+                 randr, pSize->width, pSize->height));
-+
-+    if (screenEnabled) {
-+        KdDisableScreen(pScreen);
-+    }
-+
-+    if (randr & (RR_Rotate_0|RR_Rotate_180)) {
-+        pScreen->mmWidth  = screen->width_mm;
-+        pScreen->mmHeight = screen->height_mm;
-+        pScreen->width = pSize->width;
-+        pScreen->height = pSize->height;
-+    } else {
-+	pScreen->mmWidth  = screen->height_mm;
-+	pScreen->mmHeight = screen->width_mm;
-+        pScreen->width = pSize->height;
-+        pScreen->height = pSize->width;
-+    }
-+
-+    screen->randr = randr;
-+    screen->width = pScreen->width;
-+    screen->height = pScreen->height;
-+    w100c->hw_window.randr = KdSubRotation(w100StartupInfo.randr, randr);
-+    w100c->hw_window.mode = W100GetBestMode(w100c, pScreen->width, pScreen->height);
-+
-+    KdOffscreenSwapOut(screen->pScreen);
-+
-+    W100Setup(screen);
-+
-+    DBG_IMAGEON(("ModifyPixMapHeader(width:%d,height:%d,depth:%d,bpp:%d,bs:%d,fb:0x%08x)\n", pScreen->width, pScreen->height, 
-+                 screen->fb[0].depth,
-+                 screen->fb[0].bitsPerPixel,
-+                 screen->fb[0].byteStride,
-+                 screen->fb[0].frameBuffer));
-+
-+
-+    (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap(pScreen),
-+                                    pScreen->width,
-+                                    pScreen->height,
-+                                    screen->fb[0].depth,
-+                                    screen->fb[0].bitsPerPixel,
-+                                    screen->fb[0].byteStride,
-+                                    screen->fb[0].frameBuffer);
-+
-+
-+    if (screenEnabled) {
-+        KdEnableScreen(pScreen);
-+    }
-+    return TRUE;
-+}
-+
-+static Bool W100RandRGetInfo(ScreenPtr pScreen, Rotation *rotations)
-+{
-+    KdScreenPriv(pScreen);
-+    KdScreenInfo *screen = pScreenPriv->screen;
-+    W100CardInfo(pScreenPriv);
-+    RRScreenSizePtr pSize;
-+    Rotation randr;
-+    W100ModeSpec *modes;
-+    int i;
-+
-+    DBG_IMAGEON(("--W100RandRGetInfo\n"));
-+
-+    *rotations = RR_Rotate_All;
-+
-+    for (modes = w100_modes; modes->width; modes++) {
-+        if (modes->supported) {
-+            pSize = RRRegisterSize(pScreen, 
-+                                   modes->width,
-+                                   modes->height,
-+                                   screen->width_mm,
-+                                   screen->height_mm);
-+            if (modes == w100c->hw_window.mode) {
-+                RRSetCurrentConfig(pScreen, screen->randr, 0, pSize);
-+            }
-+        }
-+    }
-+
-+    return TRUE;
-+}
-+
-+static Bool W100RandRInit(ScreenPtr pScreen)
-+{
-+    rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
-+    DBG_IMAGEON(("--W100RandRInit\n"));
-+    pScrPriv->rrSetConfig = W100RandRSetConfig;
-+    pScrPriv->rrGetInfo   = W100RandRGetInfo;
-+    return TRUE;
-+}
-+
-+#endif
-+
-+static Bool
-+W100FinishInitScreen(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    DBG_IMAGEON(("--W100FinishInitScreen\n"));
-+    if (!fbdevFinishInitScreen(pScreen))
-+        return FALSE;
-+
-+#ifdef RANDR
-+    if (!W100RandRInit(pScreen))
-+        return FALSE;
-+#endif
-+    return TRUE;
-+}
-+
-+static Bool
-+W100CreateResources(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+
-+    return fbdevCreateResources(pScreen);
-+}
-+
-+static void
-+W100Preserve(KdCardInfo * card)
-+{
-+    W100CardInfo *w100c = card->driver;
-+    DBG_IMAGEON(("--W100Preserve\n"));
-+
-+    fbdevPreserve(card);
-+}
-+
-+static void
-+W100Restore(KdCardInfo * card)
-+{
-+    W100CardInfo *w100c = card->driver;
-+    DBG_IMAGEON(("--W100Restore\n"));
-+    fbdevRestore(card);
-+}
-+
-+static Bool
-+W100DPMS(ScreenPtr pScreen, int mode)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    DBG_IMAGEON(("--W100DPMS\n"));
-+    return fbdevDPMS(pScreen, mode);
-+}
-+
-+static Bool
-+W100Enable(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+
-+    DBG_IMAGEON(("--W100Enable\n"));
-+
-+    /*
-+    if (!fbdevEnable(pScreen))
-+        return FALSE;
-+    */
-+
-+    if (w100c->mem_base == NULL) {
-+        if (!W100Map(pScreenPriv->screen->card, w100c)) {
-+            return FALSE;
-+        }
-+        W100Setup(pScreenPriv->screen);
-+    }
-+    W100SetupGraphicEngine(w100c);
-+
-+    graphic_offset_u go;
-+    go.val = MMIO_IN32(mmGRAPHIC_OFFSET);
-+    DBG_IMAGEON(("Graphic offset is 0x%08x(0x%08x)\n",
-+                 go.f.graphic_offset,
-+                 W100_CARD2HOST(go.f.graphic_offset)));
-+
-+
-+    return TRUE;
-+}
-+
-+static void
-+W100Disable(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    DBG_IMAGEON(("--W100Disable\n"));
-+    //W100Unmap(pScreenPriv->card, w100c);
-+
-+    fbdevDisable(pScreen);
-+}
-+
-+static void
-+W100GetColors(ScreenPtr pScreen, int fb, int n, xColorItem * pdefs)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+
-+    fbdevGetColors(pScreen, fb, n, pdefs);
-+}
-+
-+static void
-+W100PutColors(ScreenPtr pScreen, int fb, int n, xColorItem * pdefs)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+
-+    fbdevPutColors(pScreen, fb, n, pdefs);
-+}
-+
-+KdCardFuncs W100Funcs = {
-+    W100CardInit,                /* cardinit */
-+    W100ScreenInit,              /* scrinit */
-+    W100InitScreen,              /* initScreen */
-+    W100FinishInitScreen,        /* finishInitScreen */
-+    W100CreateResources,         /* createRes */
-+    W100Preserve,                /* preserve */
-+    W100Enable,                  /* enable */
-+    W100DPMS,                    /* dpms */
-+    W100Disable,                 /* disable */
-+    W100Restore,                 /* restore */
-+    W100ScreenFini,              /* scrfini */
-+    W100CardFini,                /* cardfini */
-+
-+    W100CursorInit,              /* initCursor */
-+    W100CursorEnable,            /* enableCursor */
-+    W100CursorDisable,           /* disableCursor */
-+    W100CursorFini,              /* finiCursor */
-+    W100RecolorCursor,           /* recolorCursor */
-+
-+    W100InitAccel,               /* initAccel */
-+    W100EnableAccel,             /* enableAccel */
-+    W100DisableAccel,            /* disableAccel */
-+    W100FiniAccel,               /* finiAccel */
-+
-+    W100GetColors,               /* getColors */
-+    W100PutColors,               /* putColors */
-+};
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_const.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_const.h	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,161 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef __IMAGEON_CONST_H__
-+#define __IMAGEON_CONST_H__
-+
-+// DP_GUI_MASTER_CNTL.GMC_Brush_DataType
-+// DP_DATATYPE.Brush_DataType
-+#define DP_BRUSH_8x8MONOOPA	0   //8x8 mono pattern (expanded to frgd, bkgd)
-+#define DP_BRUSH_8x8MONOTRA	1   //8x8 mono pattern (expanded to frgd, leave_alone)
-+#define DP_PEN_32x1MONOOPA	6   //32x1 mono pattern (expanded to frgd, bkgd)
-+#define DP_PEN_32x1MONOTRA	7   //32x1 mono pattern (expanded to frgd, leave_alone)
-+#define DP_BRUSH_8x8COLOR	10  //8x8 color pattern
-+#define DP_BRUSH_SOLIDCOLOR	13  //solid color pattern (frgd)
-+#define DP_BRUSH_NONE		15	//no brush used
-+
-+#define SIZE_BRUSH_8x8MONO	2
-+#define SIZE_PEN_32x1MONO	1
-+#define SIZE_BRUSH_8x8COLOR_8	16
-+#define SIZE_BRUSH_8x8COLOR_16	32
-+#define MAX_BRUSH_SIZE		SIZE_BRUSH_8x8COLOR_16
-+
-+// DP_GUI_MASTER_CNTL.GMC_Dst_DataType
-+// DP_DATATYPE.Dp_Dst_DataType
-+#define DP_DST_8BPP		2   // 8 bpp grey scale
-+#define DP_DST_16BPP_1555	3   //16 bpp aRGB 1555
-+#define DP_DST_16BPP_444	5   //16 bpp aRGB 4444
-+
-+// DP_GUI_MASTER_CNTL.GMC_Src_DataType
-+// DP_DATATYPE.Dp_Src_DataType
-+#define DP_SRC_1BPP_OPA		0   //mono (expanded to frgd, bkgd)
-+#define DP_SRC_1BPP_TRA		1   //mono (expanded to frgd, leave_alone)
-+#define DP_SRC_COLOR_SAME_AS_DST	3   //color (same as DST)
-+#define	DP_SRC_SOLID_COLOR_BLT		4	//solid color for Blt (use frgd)
-+#define	DP_SRC_4BPP			5	//4 bpp
-+#define	DP_SRC_12BPP_PACKED		6	//12 bpp packed
-+
-+// DP_GUI_MASTER_CNTL.GMC_Byte_Pix_Order
-+// DP_DATATYPE.Dp_Byte_Pix_Order
-+#define DP_PIX_ORDER_MSB2LSB		0   //monochrome pixel order from MSBit to LSBit
-+#define DP_PIX_ORDER_LSB2MSB		1   //monochrome pixel order from LSBit to MSBit
-+
-+// DP_GUI_MASTER_CNTL.GMC_Dp_Src_Source
-+#define DP_SRC_MEM_LINEAR		1	//loaded from memory (linear trajectory)
-+#define DP_SRC_MEM_RECTANGULAR		2   //loaded from memory (rectangular trajectory)
-+#define DP_SRC_HOSTDATA_BIT		3   //loaded from hostdata (linear trajectory)
-+#define DP_SRC_HOSTDATA_BYTE		4   //loaded from hostdata (linear trajectory & byte-aligned)
-+
-+// DP_GUI_MASTER_CNTL.GMC_Dp_Op
-+#define	DP_OP_ROP			0
-+#define	DP_OP_ARITHMETIC		1
-+
-+// E2_ARITHMETIC_CNTL.opcode
-+#define	E2_OPC_GLBALP_ADD_SRC2		0
-+#define	E2_OPC_GLBALP_SUB_SRC2		1
-+#define	E2_OPC_SRC1_ADD_SRC2		2
-+#define	E2_OPC_SRC1_SUB_SRC2		3
-+#define	E2_OPC_DST_SADDBLEND_SRC2	4
-+#define	E2_OPC_DST_CADDBLEND_SRC2	5
-+#define	E2_OPC_DST_CSUBBLEND_SRC2	6
-+#define	E2_OPC_LF_SRC2			7
-+#define	E2_OPC_SCALE_SRC2		8
-+#define	E2_OPC_STRETCH_SRC2		9
-+#define	E2_OPC_SRC1_4BPPCPYWEXP		10
-+#define	E2_OPC_MC1			11
-+#define	E2_OPC_MC2			12
-+#define E2_OPC_MC1_IDCT			13
-+#define	E2_OPC_MC2_IDCT			14
-+#define	E2_OPC_IDCT_ONLY_IFRAME		15
-+
-+// E2_ARITHMETIC_CNTL.clamp
-+#define	E2_CLAMP_OFF			0
-+#define	E2_CLAMP_ON			1
-+
-+// E2_ARITHMETIC_CNTL.rounding
-+#define	E2_ROUNDING_TRUNCATE		0
-+#define	E2_ROUNDING_TO_INFINITY		1
-+
-+// E2_ARITHMETIC_CNTL.srcblend
-+#define	E2_SRCBLEND_GLOBALALPHA		0
-+#define	E2_SRCBLEND_ZERO		1
-+#define	E2_SRCBLEND_SRC2ALPHA		2
-+#define	E2_SRCBLEND_DSTALPHA		3
-+#define	E2_SRCBLEND_ALPHA1PLANE		4
-+
-+// E2_ARITHMETIC_CNTL.destblend
-+#define	E2_DSTBLEND_GLOBALALPHA		0
-+#define	E2_DSTBLEND_ZERO		1
-+#define	E2_DSTBLEND_SRC2ALPHA		2
-+#define	E2_DSTBLEND_DSTALPHA		3
-+#define	E2_DSTBLEND_ALPHA1PLANE		4
-+
-+// LCD_FORMAT.lcd_type
-+#define	LCDTYPE_TFT333			0
-+#define	LCDTYPE_TFT444			1
-+#define	LCDTYPE_TFT555			2
-+#define	LCDTYPE_TFT666			3
-+#define	LCDTYPE_COLSTNPACK4		4
-+#define	LCDTYPE_COLSTNPACK8F1		5
-+#define	LCDTYPE_COLSTNPACK8F2		6
-+#define	LCDTYPE_COLSTNPACK16		7
-+#define	LCDTYPE_MONSTNPACK4		8
-+#define	LCDTYPE_MONSTNPACK8		9
-+
-+// CP_RB_CNTL.rb_bufsz
-+#define	RB_SIZE_2K			8
-+#define	RB_SIZE_4K			9
-+#define	RB_SIZE_8K			10
-+#define	RB_SIZE_16K			11
-+#define	RB_SIZE_32K			12
-+#define	RB_SIZE_64K			13
-+
-+// GRAPHIC_CTRL.color_depth
-+#define	COLOR_DEPTH_1BPP		0
-+#define	COLOR_DEPTH_2BPP		1
-+#define	COLOR_DEPTH_4BPP		2
-+#define	COLOR_DEPTH_8BPP		3
-+#define	COLOR_DEPTH_332			4
-+#define	COLOR_DEPTH_A444		5
-+#define	COLOR_DEPTH_A555		6
-+
-+// VIDEO_CTRL.video_mode
-+#define	VIDEO_MODE_422			0
-+#define	VIDEO_MODE_420			1
-+
-+// CLR_CMP_CNTL.cmp_fcn_src
-+#define CMP_FCN_SRC_NEQ                 4
-+#define CMP_FCN_SRC_EQ                  5
-+
-+// CLR_CMP_CNTL.cmp_src
-+#define CMP_SRC_SRC                     1
-+
-+// Overlay formats
-+#define OVLFORMAT_YUV422           (6)       
-+#define OVLFORMAT_YUV420           (7)
-+#define OVLFORMAT_RGB565           (5)
-+#define OVLFORMAT_EQU_DISPLAY      (8)
-+
-+#define W100_CLK_SRC_XTAL  0
-+#define W100_CLK_SRC_PLL   1
-+
-+#endif
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_cursor.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_cursor.c	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,569 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+
-+#include "cursorstr.h"
-+#include "imageon.h"
-+#include "imageon_regs.h"
-+
-+#define W100_CURSOR_HEIGHT (16)
-+#define W100_CURSOR_WIDTH  (16)
-+#define W100_CURSOR_PITCH  (W100_CURSOR_WIDTH / 4)
-+
-+#define W100_CURSOR_SIZE   W100_CURSOR_PITCH * W100_CURSOR_WIDTH
-+
-+static CARD16 expand2bpp[256];
-+
-+static CARD16 spread_byte(CARD8 b) 
-+{
-+    CARD16 s = b;
-+
-+    s = ((s & 0x00f0) << 4) | (s & 0x000f);
-+    s = ((s & 0x0c0c) << 2) | (s & 0x0303);
-+    s = ((s & 0x2222) << 1) | (s & 0x1111);
-+    return s;
-+}
-+
-+static void W100InitExpansionTable()
-+{
-+    int i;
-+    for (i = 0; i < 256; i++) {
-+        expand2bpp[i] = spread_byte(i);
-+    }
-+}
-+
-+#define BigEndian(v) \
-+    (((v & 0x000000ff) << 24) | \
-+     ((v & 0x0000ff00) << 8)  | \
-+     ((v & 0x00ff0000) >> 8)  | \
-+     ((v & 0xff000000) >> 24))
-+
-+#define PixelOffset(x, y) \
-+    (((y) * W100_CURSOR_PITCH + ((x) / 4)) >> 2)
-+
-+#define PixelShift(x, y) \
-+    (2 * ((x) % 16))
-+
-+#define PixelMask(x, y) \
-+    ((0xc0000000) >> PixelShift(x, y))
-+
-+#define PixelVal(src, x, y) \
-+    ((*(src + PixelOffset(x, y)) & PixelMask(x, y)) >> (30 - PixelShift(x, y)))
-+
-+#define SetPixelVal(ptr, x, y, val)                                   \
-+    *(((CARD32 *)(ptr)) + PixelOffset(x, y)) =                        \
-+        *(((CARD32 *)(ptr)) + PixelOffset(x, y)) & ~PixelMask(x, y) | \
-+        ((val) & 0x03) << (30 - PixelShift(x2, y2))
-+
-+#define DUMP_CURSOR(src) do {                         \
-+    int x;                                            \
-+    int y;                                            \
-+    for (y = 0; y < W100_CURSOR_HEIGHT; y++) {        \
-+        DBG_IMAGEON(("Line %02d: ", y));              \
-+        for (x = 0; x < W100_CURSOR_WIDTH; x++) {     \
-+            DBG_IMAGEON(("%d", PixelVal(src,x,y)));   \
-+        }                                             \
-+        DBG_IMAGEON(("\n"));                          \
-+    }                                                 \
-+    DBG_IMAGEON((".\n"));                             \
-+} while (0)
-+
-+static void
-+W100RotateCursor(int randr, CARD32 *src, CARD32 *dst)
-+{
-+    int x1, y1, x2, y2;
-+
-+    switch (randr & RR_Rotate_All) {
-+    case RR_Rotate_0:
-+        x1 = 0;
-+        y1 = 0;
-+        for (y2 = 0; y2 < W100_CURSOR_HEIGHT; y2++) {
-+            for (x2 = W100_CURSOR_WIDTH - 1; x2 >= 0; --x2) {
-+                SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1));
-+                ++x1;
-+                if (x1 >= W100_CURSOR_WIDTH) {
-+                    x1 = 0;
-+                    ++y1;
-+                }
-+            }
-+        }
-+        break;
-+    case RR_Rotate_90:
-+        x1 = 0; 
-+        y1 = 0;
-+        for (x2 = W100_CURSOR_WIDTH - 1; x2 >= 0; --x2) {
-+            for (y2 = W100_CURSOR_HEIGHT - 1; y2 >=0; --y2) {
-+                SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1));
-+                ++x1;
-+                if (x1 >= W100_CURSOR_WIDTH) {
-+                    x1 = 0;
-+                    ++y1;
-+                }
-+            }
-+        }
-+        break;
-+    case RR_Rotate_180:
-+        x1 = 0;
-+        y1 = 0;
-+        for (y2 = W100_CURSOR_HEIGHT - 1; y2 >= 0; --y2) {
-+            for (x2 = 0; x2 < W100_CURSOR_WIDTH; x2++) {
-+                SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1));
-+                ++x1;
-+                if (x1 >= W100_CURSOR_WIDTH) {
-+                    x1 = 0;
-+                    ++y1;
-+                }
-+            }
-+        }            
-+        break;
-+    case RR_Rotate_270:
-+        x1 = 0; 
-+        y1 = 0;
-+        for (x2 = 0; x2 < W100_CURSOR_WIDTH; x2++) {
-+            for (y2 = 0; y2 < W100_CURSOR_HEIGHT; y2++) {
-+                SetPixelVal(dst, x2, y2, PixelVal(src, x1, y1));
-+                ++x1;
-+                if (x1 >= W100_CURSOR_WIDTH) {
-+                    x1 = 0;
-+                    ++y1;
-+                }
-+            }
-+        }
-+        break;
-+    }
-+}
-+
-+static void
-+W100SetCursorColors(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+    CursorPtr pCursor = pCurPriv->pCursor;
-+    CursorBitsPtr bits = pCursor->bits;
-+    cursor_color_u fgcolor;
-+    cursor_color_u bgcolor;
-+
-+    fgcolor.f.cur_color_r = pCursor->foreRed   >> 8;
-+    fgcolor.f.cur_color_g = pCursor->foreGreen >> 8;
-+    fgcolor.f.cur_color_b = pCursor->foreBlue  >> 8;
-+
-+    bgcolor.f.cur_color_r = pCursor->backRed   >> 8;
-+    bgcolor.f.cur_color_g = pCursor->backGreen >> 8;
-+    bgcolor.f.cur_color_b = pCursor->backBlue  >> 8;
-+
-+    DBG_IMAGEON(("W100SetCursorColors fg(%02x,%02x,%02x), bg(%02x,%02x,%02x)\n",
-+                 fgcolor.f.cur_color_r, 
-+                 fgcolor.f.cur_color_g, 
-+                 fgcolor.f.cur_color_b,
-+                 bgcolor.f.cur_color_r, 
-+                 bgcolor.f.cur_color_g,
-+                 bgcolor.f.cur_color_b));
-+
-+    W100DisableDisplayUpdate(w100c);
-+    MMIO_OUT32(mmCURSOR1_COLOR0, bgcolor.val);
-+    MMIO_OUT32(mmCURSOR1_COLOR1, fgcolor.val);
-+    W100EnableDisplayUpdate(w100c);
-+
-+}
-+    
-+static void
-+W100LoadCursor(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+    CursorPtr pCursor = pCurPriv->pCursor;
-+    CursorBitsPtr bits = pCursor->bits;
-+    CARD32 *dst;
-+    CARD8 tmpCursor0[W100_CURSOR_SIZE];
-+    CARD8 tmpCursor1[W100_CURSOR_SIZE];
-+    CARD32 expValue, expMask;
-+    CARD32 *src;
-+    CARD32 *mask;
-+    int lwsrc;
-+    int line, i;
-+    int h, w;
-+
-+    
-+    pCurPriv->pCursor = pCursor;
-+    pCurPriv->xhot = bits->xhot;
-+    pCurPriv->yhot = bits->yhot;
-+
-+    memset(tmpCursor0, 0xaa, W100_CURSOR_SIZE);
-+
-+    h = bits->height;
-+    w = bits->width;
-+    if (h > W100_CURSOR_HEIGHT) {
-+        h = W100_CURSOR_HEIGHT;
-+    }
-+
-+    if (w > W100_CURSOR_WIDTH) {
-+        w = W100_CURSOR_WIDTH;
-+    }
-+
-+    src =  (CARD32*) bits->source;
-+    dst =  (CARD32*) tmpCursor0;
-+    mask = (CARD32*) bits->mask;
-+
-+    lwsrc = BitmapBytePad(bits->width) >> 2;
-+
-+    for (line = 0; line < h; line++) {
-+        for (i = 0; i < lwsrc; i++) {
-+            expValue = 
-+                (expand2bpp[src[i] & 0xff]) |
-+                (expand2bpp[(src[i] >> 8) & 0xff] << 16);
-+            expMask = 
-+                (expand2bpp[mask[i] & 0xff]) |
-+                (expand2bpp[(mask[i] >> 8) & 0xff] << 16);
-+            expMask |= (expMask << 1); /* Expand 01 -> 11, 00 -> 00 */
-+            dst[i] = (0xaaaaaaaa & ~expMask) | (expValue & expMask);
-+        }
-+        src  += lwsrc;
-+        mask += lwsrc;
-+        dst  += lwsrc;
-+    }
-+
-+    /* Rotate the pixmap to get the correct orientation */
-+    W100RotateCursor(w100c->hw_window.randr,
-+                     (CARD32*) tmpCursor0,
-+                     (CARD32*) tmpCursor1);
-+
-+    DUMP_CURSOR((CARD32*)tmpCursor1);
-+    /* Correct endianness */
-+    src = (CARD32*) tmpCursor1;
-+    dst = (CARD32*) (pCurPriv->area->vidmem->base + pCurPriv->area->offset);
-+    DBG_IMAGEON(("W100LoadCursor(xhot:%d,yhot:%d,width:%d,height:%d) dst(0x%08x)\n",
-+                 bits->xhot, bits->yhot, 
-+                 bits->width, bits->height,
-+                 dst));
-+
-+    for (line = 0; line < h; line++) {
-+        for (i = 0; i < lwsrc; i++) {
-+            dst[i] = BigEndian(src[i]);
-+        }
-+        src += lwsrc;
-+        dst += lwsrc;
-+    }
-+
-+    W100SetCursorColors(pScreen);
-+}
-+
-+static void 
-+W100UnloadCursor(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    cursor_h_pos_u hpos;
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+
-+    DBG_IMAGEON(("W100UnloadCursor pCurPriv:%p\n", pCurPriv));
-+
-+    hpos.val = pCurPriv->hpos;
-+    hpos.f.cur_en = 0;
-+
-+    W100DisableDisplayUpdate(w100c);
-+    MMIO_OUT32(mmCURSOR1_H_POS, hpos.val);
-+    W100EnableDisplayUpdate(w100c);
-+    pCurPriv->hpos = hpos.val;
-+}
-+
-+static void
-+W100MoveCursor(ScreenPtr pScreen, int x, int y)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+    int xoffs, yoffs;
-+    cursor_offset_u cursor_offset;
-+    cursor_h_pos_u hpos;
-+    cursor_v_pos_u vpos;
-+    graphic_h_disp_u graphic_hdisp;
-+    graphic_v_disp_u graphic_vdisp;
-+    BoxRec cursorBox, deviceBox;
-+
-+
-+    if (!pCurPriv->has_cursor) {
-+        return;
-+    }
-+    if (!pScreenPriv->enabled) {
-+        return;
-+    }
-+
-+    graphic_hdisp.val = w100c->regs.GRAPHIC_H_DISP;
-+    graphic_vdisp.val = w100c->regs.GRAPHIC_V_DISP;
-+    xoffs = 0;
-+    yoffs = 0;
-+    cursorBox.x1 = x - pCurPriv->xhot;
-+    cursorBox.y1 = y - pCurPriv->yhot;
-+    cursorBox.x2 = cursorBox.x1 + pCurPriv->width  - 1;
-+    cursorBox.y2 = cursorBox.y1 + pCurPriv->height - 1;
-+    W100MapToDevice(w100c, &cursorBox, &deviceBox);
-+
-+    if (deviceBox.x1 < 0) {
-+        xoffs = -deviceBox.x1;
-+        deviceBox.x1 = 0;
-+    }
-+
-+    if (deviceBox.y1 < 0) {
-+        yoffs = -deviceBox.y1;
-+        deviceBox.y1 = 0;
-+    }
-+    
-+    hpos.f.cur_h_start = graphic_hdisp.f.graphic_h_start + deviceBox.x1;
-+    hpos.f.cur_h_end   = graphic_hdisp.f.graphic_h_start + deviceBox.x2 + 1;
-+    hpos.f.cur_en = 1;
-+    vpos.f.cur_v_start = graphic_vdisp.f.graphic_v_start + deviceBox.y1;
-+    vpos.f.cur_v_end   = graphic_vdisp.f.graphic_v_start + deviceBox.y2 + 1;
-+
-+    cursor_offset.f.cur_x_offset = xoffs;
-+    cursor_offset.f.cur_y_offset = yoffs;
-+    cursor_offset.f.cur_offset = (CARD32) 
-+        W100_HOST2CARD(pCurPriv->area->vidmem->base
-+                       + pCurPriv->area->offset);
-+    DBG_IMAGEON(("W100MoveCursor dst(x:%d,y:%d),"
-+                 "hwpos(hpos.start:%d,hpos.end:%d,vpos.start:%d,vpos.end:%d),"
-+                 "mapped(x:%d,y:%d,xoffs:%d,yoffs:%d)\n",
-+                 x, y, 
-+                 hpos.f.cur_h_start, hpos.f.cur_h_end,
-+                 vpos.f.cur_v_start, vpos.f.cur_v_end,
-+                 deviceBox.x1, deviceBox.y1, xoffs, yoffs));
-+
-+    W100DisableDisplayUpdate(w100c);
-+    MMIO_OUT32(mmCURSOR1_OFFSET, cursor_offset.val);
-+    MMIO_OUT32(mmCURSOR1_V_POS,  vpos.val);
-+    MMIO_OUT32(mmCURSOR1_H_POS,  hpos.val);
-+    W100EnableDisplayUpdate(w100c);
-+
-+    pCurPriv->hpos = hpos.val;
-+    pCurPriv->vpos = vpos.val;
-+    pCurPriv->coffset = cursor_offset.val;
-+
-+}
-+
-+static Bool
-+W100RealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+    DBG_IMAGEON(("W100RealizeCursor\n"));
-+
-+    if (!pScreenPriv->enabled) {
-+        return TRUE;
-+    }
-+
-+    if (pCursor && pCurPriv->pCursor == pCursor) {
-+        int x, y;
-+        miPointerPosition(&x, &y);
-+        W100LoadCursor(pScreen);
-+        W100MoveCursor(pScreen, x, y);
-+    }
-+    return TRUE;
-+}
-+
-+
-+static Bool
-+W100UnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
-+{
-+    DBG_IMAGEON(("W100UnrealizeCursor\n"));
-+    return TRUE;
-+}
-+
-+
-+static void
-+W100SetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+
-+    pCurPriv->pCursor = pCursor;
-+
-+    if (!pScreenPriv->enabled) {
-+        return;
-+    }
-+
-+    if (pCursor) {
-+        W100LoadCursor(pScreen);
-+        W100MoveCursor(pScreen, x, y);
-+    } else {
-+        W100UnloadCursor(pScreen);
-+    }
-+}
-+
-+
-+miPointerSpriteFuncRec W100PointerSpriteFuncs = {
-+    W100RealizeCursor,
-+    W100UnrealizeCursor,
-+    W100SetCursor,
-+    W100MoveCursor,
-+};
-+
-+static void
-+W100QueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight,
-+                  ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+
-+    switch (class) {
-+    case CursorShape:
-+        if (*pwidth > pCurPriv->width) {
-+            *pwidth = pCurPriv->width;
-+        }
-+        if (*pheight > pCurPriv->height) {
-+            *pheight = pCurPriv->height;
-+        }
-+        if (*pwidth > pScreen->width) {
-+            *pwidth = pScreen->width;
-+        }
-+        if (*pheight > pScreen->height) {
-+            *pheight = pScreen->height;
-+        }
-+        break;
-+    default:
-+        fbQueryBestSize(class, pwidth, pheight, pScreen);
-+        break;
-+    }
-+}
-+
-+static void
-+W100CursorSave(ScreenPtr pScreen, KdOffscreenArea *area)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+    DBG_IMAGEON(("W100CursorSave\n"));
-+
-+    pCurPriv->area = NULL;
-+}
-+
-+void
-+W100CursorEnable(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+
-+    if (!pCurPriv->has_cursor) {
-+        return;
-+    }
-+
-+    DBG_IMAGEON(("W100CursorEnable\n"));
-+
-+    if (pCurPriv->area == NULL) {
-+        pCurPriv->area = KdOffscreenAlloc(pScreen, 
-+                                          W100_CURSOR_SIZE, 0, TRUE,
-+                                          W100CursorSave, w100s);
-+    }
-+    if (pCurPriv->area == NULL) {
-+        FatalError("Couldn't allocate offscreen memory for cursor.\n");
-+    } else {
-+        DBG_IMAGEON(("Cursor memory at 0x%08x(0x%08x)\n", 
-+                     pCurPriv->area->vidmem->base + pCurPriv->area->offset,
-+                     W100_HOST2CARD(pCurPriv->area->vidmem->base
-+                                    + pCurPriv->area->offset)));
-+    }
-+    if (pCurPriv->pCursor) {
-+        int x, y;
-+        miPointerPosition(&x, &y);
-+        W100LoadCursor(pScreen);
-+        W100MoveCursor(pScreen, x, y);
-+    } else {
-+        W100UnloadCursor(pScreen);
-+    }
-+}
-+
-+
-+void
-+W100CursorDisable(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+    DBG_IMAGEON(("W100CursorDisable\n"));
-+
-+    if (!pScreenPriv->enabled || !pCurPriv->has_cursor) {
-+        return;
-+    }
-+
-+    if (pCurPriv->pCursor) {
-+        W100UnloadCursor(pScreen);
-+    }
-+
-+    pCurPriv->area = NULL;
-+}
-+
-+Bool
-+W100CursorInit(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+    
-+    DBG_IMAGEON(("W100CursorInit\n"));
-+
-+    pCurPriv->width  = W100_CURSOR_WIDTH;
-+    pCurPriv->height = W100_CURSOR_HEIGHT;
-+    pScreen->QueryBestSize = W100QueryBestSize;
-+    miPointerInitialize(pScreen,
-+                        &W100PointerSpriteFuncs,
-+                        &kdPointerScreenFuncs, 
-+                        FALSE);
-+    pCurPriv->has_cursor = TRUE;
-+    pCurPriv->pCursor = NULL;
-+    W100InitExpansionTable();
-+    return TRUE;
-+}
-+
-+
-+void
-+W100RecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef)
-+{
-+    return;
-+}
-+
-+
-+void
-+W100CursorFini(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100Cursor *pCurPriv = &w100s->cursor;
-+
-+    pCurPriv->has_cursor = FALSE;
-+    pCurPriv->pCursor = NULL;
-+}
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_draw.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_draw.c	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,238 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+
-+#include "imageon.h"
-+#include "imageon_regs.h"
-+#include "imageon_const.h"
-+#include "imageon_support.h"
-+#include "kaa.h"
-+
-+static W100CardInfo *currentCard;
-+
-+void
-+W100WaitMarker(ScreenPtr pScreen, int marker)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100WaitIdle(w100c);
-+}
-+
-+Bool
-+W100PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
-+{
-+    KdScreenPriv(pPix->drawable.pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100CardInfo(pScreenPriv);
-+    W100PortPrivPtr pPortPriv = w100s->pAdaptor->pPortPrivates[0].ptr;
-+    int fifoEntries = 4;
-+
-+    DBG_IMAGEON(("W100PrepareSolid(alu:%d, pm:0x%08x, fg:%d)\n",
-+                 alu, pm, fg));
-+    
-+    W100ResetContext(w100c);
-+    W100SetPixelMask(w100c, pm);
-+
-+    if (W100SetDestinationPixmap(pPix)) {
-+        if (w100c->ctx.mask.enable) {
-+            ++fifoEntries;
-+        }
-+        if (W100WaitCmdFifoEntries(w100c, fifoEntries)) {
-+            MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeSolidGmc(w100c, alu));
-+            MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch);
-+            MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset);
-+            MMIO_OUT32(mmDP_BRUSH_FRGD_CLR, fg);
-+
-+            if (w100c->ctx.mask.enable) {
-+                MMIO_OUT32(mmDP_WRITE_MSK, pm);
-+            }
-+            currentCard = w100c;
-+            return TRUE;
-+        }
-+    }
-+    ErrorF("Error in W100PrepareSolid\n");
-+    return FALSE;
-+}
-+
-+void
-+W100Solid(int x1, int y1, int x2, int y2)
-+{
-+    W100CardInfo *w100c = currentCard;
-+    DBG_IMAGEON(("W100Solid(x1:%d,y1:%d,x2:%d,y2:%d)\n", x1, y1, x2, y2));
-+
-+    if (W100WaitCmdFifoEntries(w100c, 2)) {
-+        MMIO_OUT32(mmDST_Y_X, (y1 << 16) | x1);
-+        MMIO_OUT32(mmDST_HEIGHT_WIDTH, ((y2 - y1) << 16) | (x2 - x1));
-+    } else {
-+        ErrorF("Error in W100Solid\n");
-+    }
-+}
-+
-+void
-+W100DoneSolid(void)
-+{
-+}
-+
-+
-+Bool
-+W100PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, 
-+                int dx, int dy, int alu, Pixel pm)
-+{
-+    KdScreenPriv(pDst->drawable.pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100CardInfo(pScreenPriv);
-+    dp_datatype_u datatype;
-+
-+    int fifoEntries = 6;
-+
-+    W100ResetContext(w100c);
-+    W100SetPixelMask(w100c, pm);
-+    W100SetXForm(w100c, dx, dy);
-+
-+    if (W100SetSourcePixmap(pSrc) && W100SetDestinationPixmap(pDst)) {
-+        DBG_IMAGEON(("W100PrepareCopy(src(pitch:%d,offset:0x%08x),"
-+                     "dst(pitch:%d,offset:0x%08x))\n",
-+                     w100c->ctx.src.pitch,
-+                     w100c->ctx.src.offset,
-+                     w100c->ctx.dst.pitch,
-+                     w100c->ctx.dst.offset));
-+        if (w100c->ctx.mask.enable) {
-+            ++fifoEntries;
-+        }
-+
-+        if (W100WaitCmdFifoEntries(w100c, fifoEntries)) {
-+            MMIO_OUT32(mmSRC_PITCH,  w100c->ctx.src.pitch);
-+            MMIO_OUT32(mmSRC_OFFSET, w100c->ctx.src.offset);
-+            MMIO_OUT32(mmDST_PITCH,  w100c->ctx.dst.pitch);
-+            MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset);
-+            MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeCopyGmc(w100c, alu));
-+            if (w100c->ctx.mask.enable) {
-+                MMIO_OUT32(mmDP_WRITE_MSK, pm);
-+            }
-+            MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath);
-+            currentCard = w100c;
-+            return TRUE;
-+        }
-+    }
-+    ErrorF("Error in W100PrepareCopy\n");
-+    return FALSE;
-+}
-+
-+void
-+W100Copy(int srcX, int srcY, int dstX, int dstY, int w, int h)
-+{
-+    W100CardInfo *w100c = currentCard;
-+    DBG_IMAGEON(("W100Copy(src(x:%d,y:%d),dst(x:%d,y:%d),w:%d,h:%d)\n",
-+                 srcX, srcY, 
-+                 dstX, dstY,
-+                 w, h));
-+    if (w100c->ctx.xform.dx < 0) {
-+        dstX += w - 1;
-+        srcX += w - 1;
-+    }
-+
-+    if (w100c->ctx.xform.dy < 0) {
-+        dstY += h - 1;
-+        srcY += h - 1;
-+    }
-+
-+    if (W100WaitCmdFifoEntries(w100c, 3)) {
-+        MMIO_OUT32(mmSRC_Y_X, (srcY << 16) | srcX);
-+        MMIO_OUT32(mmDST_Y_X, (dstY << 16) | dstX);
-+        MMIO_OUT32(mmDST_HEIGHT_WIDTH, (h << 16) | w);
-+    } else {
-+        ErrorF("Error in W100Copy\n");
-+    }
-+}
-+
-+void
-+W100DoneCopy(void)
-+{
-+}
-+
-+Bool
-+W100InitAccel(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+
-+
-+    DBG_IMAGEON(("--W100InitAccel: %d/%d depth/bpp\n", 
-+                 pScreenPriv->screen->fb[0].depth,
-+                 pScreenPriv->screen->fb[0].bitsPerPixel));
-+
-+    memset(&w100s->kaa, 0, sizeof(KaaScreenInfoRec));
-+    w100s->kaa.waitMarker = W100WaitMarker;
-+    w100s->kaa.PrepareSolid = W100PrepareSolid;
-+    w100s->kaa.Solid = W100Solid;
-+    w100s->kaa.DoneSolid = W100DoneSolid;
-+    w100s->kaa.PrepareCopy = W100PrepareCopy;
-+    w100s->kaa.Copy = W100Copy;
-+    w100s->kaa.DoneCopy = W100DoneCopy;
-+
-+    w100s->kaa.flags |= KAA_OFFSCREEN_PIXMAPS;
-+    /* Offset alignment, not sure if this is enought */
-+    w100s->kaa.offsetAlign = 0;
-+    w100s->kaa.pitchAlign  = 16;
-+
-+    if (!kaaDrawInit(pScreen, &w100s->kaa)) {
-+        return FALSE;
-+    }
-+    DBG_IMAGEON(("KAA flags: 0x%08x\n", w100s->kaa.flags));
-+    return TRUE;
-+}
-+
-+void
-+W100EnableAccel(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100CardInfo(pScreenPriv);
-+
-+    DBG_IMAGEON(("--W100EnableAccel\n"));
-+
-+    w100s->kaa.PrepareBlend = NULL;
-+    w100s->kaa.Blend = NULL;
-+    w100s->kaa.DoneBlend = NULL;
-+    w100s->kaa.CheckComposite = NULL;
-+    w100s->kaa.PrepareComposite = NULL;
-+    w100s->kaa.Composite = NULL;
-+    w100s->kaa.DoneComposite = NULL;
-+    w100s->kaa.UploadToScreen = NULL;
-+    w100s->kaa.UploadToScratch = NULL;
-+    kaaMarkSync(pScreen);
-+}
-+
-+void
-+W100DisableAccel(ScreenPtr pScreen)
-+{
-+    DBG_IMAGEON(("--W100DisableAccel\n"));
-+}
-+
-+void
-+W100FiniAccel(ScreenPtr pScreen)
-+{
-+    DBG_IMAGEON(("--W100FiniAccel\n"));
-+}
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon.h	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,284 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _IMAGEON_H_
-+#define _IMAGEON_H_
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+
-+#include <fbdev.h>
-+
-+#include <kxv.h>
-+
-+#define DEBUG_IMAGEON 0
-+#if DEBUG_IMAGEON
-+#define DBG_IMAGEON(a)  ErrorF a
-+#else
-+#define DBG_IMAGEON(a)
-+#endif
-+
-+
-+#define W100_MEM_BASE   (0x08000000)
-+#define W100_REG_OFFSET (0x00010000)
-+#define W100_REG_BASE   (W100_MEM_BASE + W100_REG_OFFSET)
-+#define W100_MEM_SIZE   (0x01000000)
-+#define W100_REG_SIZE   (0x00002000)
-+#define W100_CMDFIFO_SIZE (16)
-+
-+#define W100_CARD2HOST(x) (w100c->mem_base + (CARD32)(x))
-+#define W100_HOST2CARD(x) ((x) - (CARD32)(w100c->mem_base))
-+#define W100_MEMAREAS   (2)
-+#define W100_INTMEM     (0)
-+#define W100_EXTMEM     (1)
-+
-+#define W100_SYSFS_BASE "/sys/bus/platform/devices/w100fb/"
-+
-+#define MMIO_OUT32(a, v)   (*(VOL32 *)((w100c->reg_base) + (a)) = (v))
-+#define MMIO_IN32(a)       (*(VOL32 *)((w100c->reg_base) + (a)))
-+
-+#define W100_MAX(x, y) ((x) > (y) ? x : y)
-+#define W100_MIN(x, y) ((x) < (y) ? x : y)
-+
-+#define W100_ALIGN(q, a) ((q + a - 1) & ~(a - 1))
-+
-+#define TIMEOUT_LOCALS struct timeval _target, _curtime;
-+
-+static inline Bool
-+tv_le(struct timeval *tv1, struct timeval *tv2)
-+{
-+    if (tv1->tv_sec < tv2->tv_sec ||
-+        (tv1->tv_sec == tv2->tv_sec && 
-+         tv1->tv_usec < tv2->tv_usec))
-+        return TRUE;
-+    else
-+        return FALSE;
-+}
-+
-+#define WHILE_NOT_TIMEOUT(_timeout)					\
-+    gettimeofday(&_target, NULL);					\
-+    _target.tv_usec += ((_timeout) * 1000000);                          \
-+    _target.tv_sec += _target.tv_usec / 1000000;			\
-+    _target.tv_usec = _target.tv_usec % 1000000;			\
-+    while (gettimeofday(&_curtime, NULL), tv_le(&_curtime, &_target))
-+
-+#define TIMEDOUT()	(!tv_le(&_curtime, &_target))
-+
-+typedef volatile CARD8	VOL8;
-+typedef volatile CARD16	VOL16;
-+typedef volatile CARD32	VOL32;
-+
-+typedef struct _W100CardEntry {
-+    CARD16 vendor;
-+    CARD16 device;
-+    CARD8 caps;
-+    char *name;
-+} W100CardEntry;
-+
-+
-+typedef enum _W100Caps {
-+    W100XVSupport = 1
-+} W100Caps;
-+
-+typedef struct _W100ModeSpec {
-+    CARD16 width;
-+    CARD16 height;
-+    CARD8  bpp;
-+    CARD8  fbpool;
-+    Bool   supported;
-+} W100ModeSpec;
-+
-+typedef struct _W100BoxRec {
-+    CARD16 x;
-+    CARD16 y;
-+    CARD16 w;
-+    CARD16 h;
-+} W100BoxRec, *W100BoxPtr;
-+
-+typedef struct _W100Mode {
-+    CARD16 width;
-+    CARD16 height;
-+    CARD8  bpp;
-+} W100Mode;
-+
-+typedef struct _W100MemArea {
-+    CARD8 *start;
-+    CARD32 size;
-+    CARD8 priority;
-+} W100MemArea;
-+
-+typedef struct _W100StartupInfo {
-+    W100CardEntry *card_id;
-+    W100Mode mode;
-+    Bool portrait;
-+    int randr;
-+} W100StartupInfo;
-+
-+typedef struct _W100CardInfo {
-+    FbdevPriv fbdev;
-+    W100CardEntry    *card_id;
-+    CARD8 *mem_base;
-+    CARD8 *reg_base;
-+    W100MemArea **memareas;
-+    int num_memareas;
-+    int cmdfifo_entries;
-+    struct {
-+        CARD32  ENG_CNTL;
-+        CARD32  VIDEO_CTRL;
-+        CARD32  GRAPHIC_H_DISP;
-+        CARD32  GRAPHIC_V_DISP;
-+        CARD32  DISP_DEBUG2;
-+    } regs;
-+    struct {
-+        CARD8 *offset;
-+        CARD16 width;
-+        CARD16 height;
-+        int randr;
-+        W100ModeSpec *mode;
-+        CARD8 bpp;
-+    } hw_window;
-+    CARD8 last_dst_videomem;
-+    CARD8 last_src_videomem;
-+    struct {
-+        struct {
-+            CARD8 datatype;
-+            CARD32 pitch;
-+            CARD32 offset;
-+            CARD8 videomem;
-+        } dst;
-+        struct {
-+            CARD8 datatype;
-+            CARD32 pitch;
-+            CARD32 offset;
-+            CARD8 videomem;
-+        } src;
-+        struct {
-+            int dx;
-+            int dy;
-+            int randr;
-+            Bool mirror;
-+            CARD32 dataPath;
-+        } xform;
-+        struct {
-+            Pixel pm;
-+            Bool enable;
-+        } mask;
-+    } ctx;
-+} W100CardInfo;
-+
-+#define W100GetCardInfo(kd)	((W100CardInfo *) ((kd)->card->driver))
-+#define W100CardInfo(kd)	W100CardInfo *w100c = W100GetCardInfo(kd)
-+
-+typedef struct _W100Cursor {
-+    int width, height;
-+    int xhot, yhot;
-+    Bool has_cursor;
-+    CursorPtr pCursor;
-+    KdOffscreenArea *area;
-+    CARD32 vpos;
-+    CARD32 hpos;
-+    CARD32 coffset;
-+} W100Cursor;
-+
-+typedef struct _W100ScreenInfo {
-+    FbdevScrPriv fbdev;
-+    KaaScreenInfoRec kaa;
-+    W100CardInfo *w100c;
-+    KdScreenInfo *screen;
-+    KdVideoAdaptorPtr pAdaptor;
-+    W100Cursor cursor;
-+} W100ScreenInfo;
-+
-+#define W100GetScreenInfo(kd)  ((W100ScreenInfo *) ((kd)->screen->driver))
-+#define W100ScreenInfo(kd) W100ScreenInfo *w100s = W100GetScreenInfo(kd)
-+
-+typedef enum _W100VideoStatus {
-+    W100_OVERLAY_ON         = 1,
-+    W100_OVERLAY_CONFIGURED = 2
-+} W100VideoStatus;
-+
-+
-+typedef struct _W100PortPriv {
-+    CARD32 videoStatus;
-+    CARD32 videoCtrl;
-+    RegionRec clip;
-+    struct {
-+        int width;                /* Source width  */
-+        int height;               /* Source height */
-+        unsigned char *buffer;    /* Source buffer */
-+        int id;                   /* Source FOURCC */
-+        int size;                 /* Size of source rect (bytes) */
-+        KdOffscreenArea *surface; /* Source surface (on card memory) */
-+        BoxRec box;               /* Source rect boundaries */
-+    } src;
-+    struct {
-+        BoxRec box;               /* Screen rectangle */
-+    } dst;
-+    struct {
-+        int size;                  /* Size of the overlay surface (bytes) */
-+        KdOffscreenArea *surface;  /* Overlay surface (on card memory)    */
-+        BoxRec box;                /* Overlay box (util size)             */
-+        BoxRec frame;              /* Overlay box (plus corrections)      */
-+        Bool changed;              /* To avoid recalculations             */
-+        int horExp;                /* Horizontal expansion                */
-+        int verExp;                /* Vertical expansion                  */
-+        int maxSize;               /* Maximum allowed surface size (bytes) */
-+        int colorKey;              /* Colour to replace with overlay */
-+        int brightness;            /* Brigthness */
-+    } ovl;
-+    struct {
-+        int size;                  /* Number of planes  */
-+        int bpp;                   /* bpp of the planes */
-+        int offset[3];             /* Planes offsets    */
-+        CARD32 yplane;             /* Offset (card) of Y plane */
-+        CARD32 uplane;             /* Offset (card) of U plane */
-+        CARD32 vplane;             /* Offset (card) of V plane */
-+    } planes;
-+    Bool changed;              /* To track changes and avoid recalculations */
-+} W100PortPrivRec, *W100PortPrivPtr;
-+
-+extern KdCardFuncs W100Funcs;
-+
-+/* imageon_draw.c */
-+void W100WaitMarker(ScreenPtr pScreen, int marker);
-+Bool W100PrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg);
-+void W100Solid(int x1, int y1, int x2, int y2);
-+Bool W100PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, 
-+                     int dx, int dy, int alu, Pixel pm);
-+void W100Copy(int srcX, int srcY, int dstX, int dstY, int w, int h);
-+void W100DoneCopy(void);
-+Bool W100InitAccel(ScreenPtr pScreen);
-+void W100EnableAccel(ScreenPtr pScreen);
-+void W100DisableAccel(ScreenPtr pScreen);
-+void W100FiniAccel(ScreenPtr pScreen);
-+/* imageon_cursor.c */
-+void W100CursorEnable(ScreenPtr pScreen);
-+void W100CursorDisable(ScreenPtr pScreen);
-+Bool W100CursorInit(ScreenPtr pScreen);
-+void W100RecolorCursor(ScreenPtr pScreen, int ndef, xColorItem * pdef);
-+void W100CursorFini(ScreenPtr pScreen);
-+
-+
-+
-+
-+#endif /* _IMAGEON_H_ */
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_regs.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_regs.h	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,4155 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef __IMAGEON_REGS_H__
-+#define __IMAGEON_REGS_H__
-+
-+/* Block CIF Start: */
-+#define mmCHIP_ID                                                    0x0000
-+#define mmREVISION_ID                                                0x0004
-+#define mmWRAP_BUF_A                                                 0x0008
-+#define mmWRAP_BUF_B                                                 0x000C
-+#define mmWRAP_TOP_DIR                                               0x0010
-+#define mmWRAP_START_DIR                                             0x0014
-+#define mmCIF_CNTL                                                   0x0018
-+#define mmCFGREG_BASE                                                0x001C
-+#define mmCIF_IO                                                     0x0020
-+#define mmCIF_READ_DBG                                               0x0024
-+#define mmCIF_WRITE_DBG                                              0x0028
-+#define cfgIND_ADDR_A_0                                              0x0000
-+#define cfgIND_ADDR_A_1                                              0x0001
-+#define cfgIND_ADDR_A_2                                              0x0002
-+#define cfgIND_DATA_A                                                0x0003
-+#define cfgREG_BASE                                                  0x0004
-+#define cfgINTF_CNTL                                                 0x0005
-+#define cfgSTATUS                                                    0x0006
-+#define cfgCPU_DEFAULTS                                              0x0007
-+#define cfgIND_ADDR_B_0                                              0x0008
-+#define cfgIND_ADDR_B_1                                              0x0009
-+#define cfgIND_ADDR_B_2                                              0x000A
-+#define cfgIND_DATA_B                                                0x000B
-+#define cfgPM4_RPTR                                                  0x000C
-+#define cfgSCRATCH                                                   0x000D
-+#define cfgPM4_WRPTR_0                                               0x000E
-+#define cfgPM4_WRPTR_1                                               0x000F
-+/* Block CIF End: */
-+
-+/* Block CP Start: */
-+#define mmCP_RB_CNTL                                                 0x0210
-+#define mmCP_RB_BASE                                                 0x0214
-+#define mmCP_RB_RPTR_ADDR                                            0x0218
-+#define mmCP_RB_RPTR                                                 0x021C
-+#define mmCP_RB_RPTR_WR                                              0x02F8
-+#define mmCP_RB_WPTR                                                 0x0220
-+#define mmCP_IB_BASE                                                 0x0228
-+#define mmCP_IB_BUFSZ                                                0x022C
-+#define mmCP_CSQ_CNTL                                                0x0230
-+#define mmCP_CSQ_APER_PRIMARY                                        0x0300
-+#define mmCP_CSQ_APER_INDIRECT                                       0x0340
-+#define mmCP_ME_CNTL                                                 0x0240
-+#define mmCP_ME_RAM_ADDR                                             0x0244
-+#define mmCP_ME_RAM_RADDR                                            0x0248
-+#define mmCP_ME_RAM_DATAH                                            0x024C
-+#define mmCP_ME_RAM_DATAL                                            0x0250
-+#define mmCP_DEBUG                                                   0x025C
-+#define mmSCRATCH_REG0                                               0x0260
-+#define mmSCRATCH_REG1                                               0x0264
-+#define mmSCRATCH_REG2                                               0x0268
-+#define mmSCRATCH_REG3                                               0x026C
-+#define mmSCRATCH_REG4                                               0x0270
-+#define mmSCRATCH_REG5                                               0x0274
-+#define mmSCRATCH_UMSK                                               0x0280
-+#define mmSCRATCH_ADDR                                               0x0284
-+#define mmCP_CSQ_ADDR                                                0x02E4
-+#define mmCP_CSQ_DATA                                                0x02E8
-+#define mmCP_CSQ_STAT                                                0x02EC
-+#define mmCP_STAT                                                    0x02F0
-+#define mmGEN_INT_CNTL                                               0x0200
-+#define mmGEN_INT_STATUS                                             0x0204
-+/* Block CP End: */
-+
-+/* Block DISPLAY Start: */
-+#define mmLCD_FORMAT                                                 0x0410
-+#define mmGRAPHIC_CTRL                                               0x0414
-+#define mmGRAPHIC_OFFSET                                             0x0418
-+#define mmGRAPHIC_PITCH                                              0x041C
-+#define mmCRTC_TOTAL                                                 0x0420
-+#define mmACTIVE_H_DISP                                              0x0424
-+#define mmACTIVE_V_DISP                                              0x0428
-+#define mmGRAPHIC_H_DISP                                             0x042C
-+#define mmGRAPHIC_V_DISP                                             0x0430
-+#define mmVIDEO_CTRL                                                 0x0434
-+#define mmGRAPHIC_KEY                                                0x0438
-+#define mmVIDEO_Y_OFFSET                                             0x043C
-+#define mmVIDEO_Y_PITCH                                              0x0440
-+#define mmVIDEO_U_OFFSET                                             0x0444
-+#define mmVIDEO_U_PITCH                                              0x0448
-+#define mmVIDEO_V_OFFSET                                             0x044C
-+#define mmVIDEO_V_PITCH                                              0x0450
-+#define mmVIDEO_H_POS                                                0x0454
-+#define mmVIDEO_V_POS                                                0x0458
-+#define mmBRIGHTNESS_CNTL                                            0x045C
-+#define mmCURSOR1_OFFSET                                             0x0460
-+#define mmCURSOR1_H_POS                                              0x0464
-+#define mmCURSOR1_V_POS                                              0x0468
-+#define mmCURSOR1_COLOR0                                             0x046C
-+#define mmCURSOR1_COLOR1                                             0x0470
-+#define mmCURSOR2_OFFSET                                             0x0474
-+#define mmCURSOR2_H_POS                                              0x0478
-+#define mmCURSOR2_V_POS                                              0x047C
-+#define mmCURSOR2_COLOR0                                             0x0480
-+#define mmCURSOR2_COLOR1                                             0x0484
-+#define mmDISP_INT_CNTL                                              0x0488
-+#define mmCRTC_SS                                                    0x048C
-+#define mmCRTC_LS                                                    0x0490
-+#define mmCRTC_REV                                                   0x0494
-+#define mmCRTC_DCLK                                                  0x049C
-+#define mmCRTC_GS                                                    0x04A0
-+#define mmCRTC_VPOS_GS                                               0x04A4
-+#define mmCRTC_GCLK                                                  0x04A8
-+#define mmCRTC_GOE                                                   0x04AC
-+#define mmCRTC_FRAME                                                 0x04B0
-+#define mmCRTC_FRAME_VPOS                                            0x04B4
-+#define mmGPIO_DATA                                                  0x04B8
-+#define mmGPIO_CNTL1                                                 0x04BC
-+#define mmGPIO_CNTL2                                                 0x04C0
-+#define mmLCDD_CNTL1                                                 0x04C4
-+#define mmLCDD_CNTL2                                                 0x04C8
-+#define mmGENLCD_CNTL1                                               0x04CC
-+#define mmGENLCD_CNTL2                                               0x04D0
-+#define mmDISP_DEBUG                                                 0x04D4
-+#define mmDISP_DB_BUF_CNTL                                           0x04D8
-+#define mmDISP_CRC_SIG                                               0x04DC
-+#define mmCRTC_DEFAULT_COUNT                                         0x04E0
-+#define mmLCD_BACKGROUND_COLOR                                       0x04E4
-+#define mmCRTC_PS2                                                   0x04E8
-+#define mmCRTC_PS2_VPOS                                              0x04EC
-+#define mmCRTC_PS1_ACTIVE                                            0x04F0
-+#define mmCRTC_PS1_NACTIVE                                           0x04F4
-+#define mmCRTC_GCLK_EXT                                              0x04F8
-+#define mmCRTC_ALW                                                   0x04FC
-+#define mmCRTC_ALW_VPOS                                              0x0500
-+#define mmCRTC_PSK                                                   0x0504
-+#define mmCRTC_PSK_HPOS                                              0x0508
-+#define mmCRTC_CV4_START                                             0x050C
-+#define mmCRTC_CV4_END                                               0x0510
-+#define mmCRTC_CV4_HPOS                                              0x0514
-+#define mmCRTC_ECK                                                   0x051C
-+#define mmREFRESH_CNTL                                               0x0520
-+#define mmGENLCD_CNTL3                                               0x0524
-+#define mmGPIO_DATA2                                                 0x0528
-+#define mmGPIO_CNTL3                                                 0x052C
-+#define mmGPIO_CNTL4                                                 0x0530
-+#define mmCHIP_STRAP                                                 0x0534
-+#define mmDISP_DEBUG2                                                0x0538
-+#define mmDEBUG_BUS_CNTL                                             0x053C
-+#define mmGAMMA_VALUE1                                               0x0540
-+#define mmGAMMA_VALUE2                                               0x0544
-+#define mmGAMMA_SLOPE                                                0x0548
-+#define mmGEN_STATUS                                                 0x054C
-+#define mmHW_INT                                                     0x0550
-+/* Block DISPLAY End: */
-+
-+/* Block GFX Start: */
-+#define mmDST_OFFSET                                                 0x1004
-+#define mmDST_PITCH                                                  0x1008
-+#define mmDST_PITCH_OFFSET                                           0x102C
-+#define mmDST_X                                                      0x101C
-+#define mmDST_Y                                                      0x1020
-+#define mmDST_X_Y                                                    0x1194
-+#define mmDST_Y_X                                                    0x1038
-+#define mmDST_WIDTH                                                  0x100C
-+#define mmDST_HEIGHT                                                 0x1010
-+#define mmDST_WIDTH_HEIGHT                                           0x1198
-+#define mmDST_HEIGHT_WIDTH                                           0x103C
-+#define mmDST_HEIGHT_WIDTH_8                                         0x118C
-+#define mmDST_HEIGHT_Y                                               0x11A0
-+#define mmDST_WIDTH_X                                                0x1188
-+#define mmDST_WIDTH_X_INCY                                           0x119C
-+#define mmDST_LINE_START                                             0x1090
-+#define mmDST_LINE_END                                               0x1094
-+#define mmBRUSH_OFFSET                                               0x108C
-+#define mmBRUSH_Y_X                                                  0x1074
-+#define mmDP_BRUSH_FRGD_CLR                                          0x107C
-+#define mmDP_BRUSH_BKGD_CLR                                          0x1078
-+#define mmSRC2_OFFSET                                                0x1060
-+#define mmSRC2_PITCH                                                 0x1064
-+#define mmSRC2_PITCH_OFFSET                                          0x1068
-+#define mmSRC2_X                                                     0x1050
-+#define mmSRC2_Y                                                     0x1054
-+#define mmSRC2_X_Y                                                   0x1058
-+#define mmSRC2_WIDTH                                                 0x1080
-+#define mmSRC2_HEIGHT                                                0x1084
-+#define mmSRC2_INC                                                   0x1088
-+#define mmSRC_OFFSET                                                 0x11AC
-+#define mmSRC_PITCH                                                  0x11B0
-+#define mmSRC_PITCH_OFFSET                                           0x1028
-+#define mmSRC_X                                                      0x1014
-+#define mmSRC_Y                                                      0x1018
-+#define mmSRC_X_Y                                                    0x1190
-+#define mmSRC_Y_X                                                    0x1034
-+#define mmSRC_WIDTH                                                  0x1040
-+#define mmSRC_HEIGHT                                                 0x1044
-+#define mmSRC_INC                                                    0x1048
-+#define mmHOST_DATA0                                                 0x13C0
-+#define mmHOST_DATA1                                                 0x13C4
-+#define mmHOST_DATA2                                                 0x13C8
-+#define mmHOST_DATA3                                                 0x13CC
-+#define mmHOST_DATA4                                                 0x13D0
-+#define mmHOST_DATA5                                                 0x13D4
-+#define mmHOST_DATA6                                                 0x13D8
-+#define mmHOST_DATA7                                                 0x13DC
-+#define mmHOST_DATA_LAST                                             0x13E0
-+#define mmDP_SRC_FRGD_CLR                                            0x1240
-+#define mmDP_SRC_BKGD_CLR                                            0x1244
-+#define mmSC_LEFT                                                    0x1140
-+#define mmSC_RIGHT                                                   0x1144
-+#define mmSC_TOP                                                     0x1148
-+#define mmSC_BOTTOM                                                  0x114C
-+#define mmSRC_SC_RIGHT                                               0x1154
-+#define mmSRC_SC_BOTTOM                                              0x115C
-+#define mmDP_CNTL                                                    0x11C8
-+#define mmDP_CNTL_DST_DIR                                            0x11CC
-+#define mmDP_DATATYPE                                                0x12C4
-+#define mmDP_MIX                                                     0x12C8
-+#define mmDP_WRITE_MSK                                               0x12CC
-+#define mmCLR_CMP_CLR_SRC                                            0x1234
-+#define mmCLR_CMP_CLR_DST                                            0x1238
-+#define mmCLR_CMP_CNTL                                               0x1230
-+#define mmCLR_CMP_MSK                                                0x123C
-+#define mmDEFAULT_PITCH_OFFSET                                       0x10A0
-+#define mmDEFAULT_SC_BOTTOM_RIGHT                                    0x10A8
-+#define mmDEFAULT2_SC_BOTTOM_RIGHT                                   0x10AC
-+#define mmREF1_PITCH_OFFSET                                          0x10B8
-+#define mmREF2_PITCH_OFFSET                                          0x10BC
-+#define mmREF3_PITCH_OFFSET                                          0x10C0
-+#define mmREF4_PITCH_OFFSET                                          0x10C4
-+#define mmREF5_PITCH_OFFSET                                          0x10C8
-+#define mmREF6_PITCH_OFFSET                                          0x10CC
-+#define mmDP_GUI_MASTER_CNTL                                         0x106C
-+#define mmSC_TOP_LEFT                                                0x11BC
-+#define mmSC_BOTTOM_RIGHT                                            0x11C0
-+#define mmSRC_SC_BOTTOM_RIGHT                                        0x11C4
-+#define mmGLOBAL_ALPHA                                               0x1210
-+#define mmFILTER_COEF                                                0x1214
-+#define mmMVC_CNTL_START                                             0x11E0
-+#define mmE2_ARITHMETIC_CNTL                                         0x1220
-+#define mmDEBUG0                                                     0x1280
-+#define mmDEBUG1                                                     0x1284
-+#define mmDEBUG2                                                     0x1288
-+#define mmDEBUG3                                                     0x128C
-+#define mmDEBUG4                                                     0x1290
-+#define mmDEBUG5                                                     0x1294
-+#define mmDEBUG6                                                     0x1298
-+#define mmDEBUG7                                                     0x129C
-+#define mmDEBUG8                                                     0x12A0
-+#define mmDEBUG9                                                     0x12A4
-+#define mmDEBUG10                                                    0x12A8
-+#define mmDEBUG11                                                    0x12AC
-+#define mmDEBUG12                                                    0x12B0
-+#define mmDEBUG13                                                    0x12B4
-+#define mmDEBUG14                                                    0x12B8
-+#define mmDEBUG15                                                    0x12BC
-+#define mmENG_CNTL                                                   0x13E8
-+#define mmENG_PERF_CNT                                               0x13F0
-+/* Block GFX End: */
-+
-+/* Block IDCT Start: */
-+#define mmIDCT_RUNS                                                  0x0C00
-+#define mmIDCT_LEVELS                                                0x0C04
-+#define mmIDCT_CONTROL                                               0x0C3C
-+#define mmIDCT_AUTH_CONTROL                                          0x0C08
-+#define mmIDCT_AUTH                                                  0x0C0C
-+/* Block IDCT End: */
-+
-+/* Block MC Start: */
-+#define mmMEM_CNTL                                                   0x0180
-+#define mmMEM_ARB                                                    0x0184
-+#define mmMC_FB_LOCATION                                             0x0188
-+#define mmMEM_EXT_CNTL                                               0x018C
-+#define mmMC_EXT_MEM_LOCATION                                        0x0190
-+#define mmMEM_EXT_TIMING_CNTL                                        0x0194
-+#define mmMEM_SDRAM_MODE_REG                                         0x0198
-+#define mmMEM_IO_CNTL                                                0x019C
-+#define mmMC_DEBUG                                                   0x01A0
-+#define mmMC_BIST_CTRL                                               0x01A4
-+#define mmMC_BIST_COLLAR_READ                                        0x01A8
-+#define mmTC_MISMATCH                                                0x01AC
-+#define mmMC_PERF_MON_CNTL                                           0x01B0
-+#define mmMC_PERF_COUNTERS                                           0x01B4
-+/* Block MC End: */
-+
-+/* Block RBBM Start: */
-+#define mmWAIT_UNTIL                                                 0x1400
-+#define mmISYNC_CNTL                                                 0x1404
-+#define mmRBBM_GUICNTL                                               0x1408
-+#define mmRBBM_STATUS                                                0x0140
-+#define mmRBBM_STATUS_alt_1                                          0x140C
-+#define mmRBBM_CNTL                                                  0x0144
-+#define mmRBBM_SOFT_RESET                                            0x0148
-+#define mmNQWAIT_UNTIL                                               0x0150
-+#define mmRBBM_DEBUG                                                 0x016C
-+#define mmRBBM_CMDFIFO_ADDR                                          0x0170
-+#define mmRBBM_CMDFIFO_DATAL                                         0x0174
-+#define mmRBBM_CMDFIFO_DATAH                                         0x0178
-+#define mmRBBM_CMDFIFO_STAT                                          0x017C
-+/* Block RBBM End: */
-+
-+/* Block CG Start: */
-+#define mmCLK_PIN_CNTL                                               0x0080
-+#define mmPLL_REF_FB_DIV                                             0x0084
-+#define mmPLL_CNTL                                                   0x0088
-+#define mmSCLK_CNTL                                                  0x008C
-+#define mmPCLK_CNTL                                                  0x0090
-+#define mmCLK_TEST_CNTL                                              0x0094
-+#define mmPWRMGT_CNTL                                                0x0098
-+#define mmPWRMGT_STATUS                                              0x009C
-+/* Block CG End: */
-+
-+/* default value definitions */
-+#define defCHIP_ID                        0x00001002
-+#define defREVISION_ID                    0x00000000
-+#define defWRAP_BUF_A                     0x01000000
-+#define defWRAP_BUF_B                     0x01000000
-+#define defWRAP_TOP_DIR                   0x00000000
-+#define defWRAP_START_DIR                 0x00000000
-+//#define defCIF_CNTL                       0x00082900
-+#define defCIF_CNTL                       0x00182d00		//??updated by Tobey Z.for Sharp,Oct11,2002
-+#define defCFGREG_BASE                    0x00000000
-+//#define defCIF_IO                         0x000c0800
-+#define defCIF_IO                         0x000C0902		//??updated by Tobey Z.for Sharp,Oct11,2002
-+#define defCIF_READ_DBG                   0x00018223
-+#define defCIF_WRITE_DBG                  0x00002100
-+#define defIND_ADDR_A_0                   0x00000000
-+#define defIND_ADDR_A_1                   0x00000000
-+#define defIND_ADDR_A_2                   0x00000000
-+#define defIND_DATA_A                     0x00000000
-+#define defREG_BASE                       0x00000001
-+#define defINTF_CNTL                      0x00000011
-+#define defSTATUS                         0x00000000
-+#define defCPU_DEFAULTS                   0x00000006
-+#define defIND_ADDR_B_0                   0x00000000
-+#define defIND_ADDR_B_1                   0x00000000
-+#define defIND_ADDR_B_2                   0x00000000
-+#define defIND_DATA_B                     0x00000000
-+#define defPM4_RPTR                       0x00000000
-+#define defSCRATCH                        0x00000000
-+#define defPM4_WRPTR_0                    0x00000000
-+#define defPM4_WRPTR_1                    0x00000000
-+#define defCP_RB_CNTL                     0x00000000
-+#define defCP_RB_BASE                     0x00000000
-+#define defCP_RB_RPTR_ADDR                0x00000000
-+#define defCP_RB_RPTR                     0x00000000
-+#define defCP_RB_RPTR_WR                  0x00000000
-+#define defCP_RB_WPTR                     0x00000000
-+#define defCP_IB_BASE                     0x00000000
-+#define defCP_IB_BUFSZ                    0x00000000
-+#define defCP_CSQ_CNTL                    0x00000000
-+#define defCP_CSQ_APER_PRIMARY            0x00000000
-+#define defCP_CSQ_APER_INDIRECT           0x00000000
-+#define defCP_ME_CNTL                     0x40000000
-+#define defCP_ME_RAM_ADDR                 0x00000000
-+#define defCP_ME_RAM_RADDR                0x00000000
-+#define defCP_ME_RAM_DATAH                0x00000000
-+#define defCP_ME_RAM_DATAL                0x00000000
-+#define defCP_DEBUG                       0x00000000
-+#define defSCRATCH_REG0                   0x00000000
-+#define defSCRATCH_REG1                   0x00000000
-+#define defSCRATCH_REG2                   0x00000000
-+#define defSCRATCH_REG3                   0x00000000
-+#define defSCRATCH_REG4                   0x00000000
-+#define defSCRATCH_REG5                   0x00000000
-+#define defSCRATCH_UMSK                   0x00000000
-+#define defSCRATCH_ADDR                   0x00000000
-+#define defCP_CSQ_ADDR                    0x00000000
-+#define defCP_CSQ_DATA                    0x00000000
-+#define defCP_CSQ_STAT                    0x00000000
-+#define defCP_STAT                        0x00000000
-+#define defGEN_INT_CNTL                   0x00000000
-+#define defGEN_INT_STATUS_rd              0x00080000
-+#define defGEN_INT_STATUS_wr              0x00000000
-+#define defLCD_FORMAT                     0x00000000
-+#define defGRAPHIC_CTRL                   0x00000000
-+#define defGRAPHIC_OFFSET                 0x00000000
-+#define defGRAPHIC_PITCH                  0x00000000
-+#define defCRTC_TOTAL                     0x00000000
-+#define defACTIVE_H_DISP                  0x00000000
-+#define defACTIVE_V_DISP                  0x00000000
-+#define defGRAPHIC_H_DISP                 0x00000000
-+#define defGRAPHIC_V_DISP                 0x00000000
-+#define defVIDEO_CTRL                     0x00000000
-+#define defGRAPHIC_KEY                    0x00000000
-+#define defVIDEO_Y_OFFSET                 0x00000000
-+#define defVIDEO_Y_PITCH                  0x00000000
-+#define defVIDEO_U_OFFSET                 0x00000000
-+#define defVIDEO_U_PITCH                  0x00000000
-+#define defVIDEO_V_OFFSET                 0x00000000
-+#define defVIDEO_V_PITCH                  0x00000000
-+#define defVIDEO_H_POS                    0x00000000
-+#define defVIDEO_V_POS                    0x00000000
-+#define defBRIGHTNESS_CNTL                0x00000000
-+#define defCURSOR1_OFFSET                 0x00000000
-+#define defCURSOR1_H_POS                  0x00000000
-+#define defCURSOR1_V_POS                  0x00000000
-+#define defCURSOR1_COLOR0                 0x00000000
-+#define defCURSOR1_COLOR1                 0x00000000
-+#define defCURSOR2_OFFSET                 0x00000000
-+#define defCURSOR2_H_POS                  0x00000000
-+#define defCURSOR2_V_POS                  0x00000000
-+#define defCURSOR2_COLOR0                 0x00000000
-+#define defCURSOR2_COLOR1                 0x00000000
-+#define defDISP_INT_CNTL                  0x00000000
-+#define defCRTC_SS                        0x00000000
-+#define defCRTC_LS                        0x00000000
-+#define defCRTC_REV                       0x00000000
-+#define defCRTC_DCLK                      0x00000000
-+#define defCRTC_GS                        0x00000000
-+#define defCRTC_VPOS_GS                   0x00000000
-+#define defCRTC_GCLK                      0x00000000
-+#define defCRTC_GOE                       0x00000000
-+#define defCRTC_FRAME                     0x00000000
-+#define defCRTC_FRAME_VPOS                0x00000000
-+#define defGPIO_DATA                      0x00000000
-+#define defGPIO_CNTL1                     0xff00ff00
-+#define defGPIO_CNTL2                     0x00000000
-+#define defLCDD_CNTL1                     0x0000ffff
-+#define defLCDD_CNTL2                     0x00000000
-+#define defGENLCD_CNTL1                   0x00aaa002
-+#define defGENLCD_CNTL2                   0x00000002
-+#define defDISP_DEBUG                     0x00000000
-+#define defDISP_DB_BUF_CNTL_rd            0x00000000
-+#define defDISP_DB_BUF_CNTL_wr            0x00000000
-+#define defDISP_CRC_SIG                   0x00000000
-+#define defCRTC_DEFAULT_COUNT             0x00000000
-+#define defLCD_BACKGROUND_COLOR           0x00000000
-+#define defCRTC_PS2                       0x00000000
-+#define defCRTC_PS2_VPOS                  0x00000000
-+#define defCRTC_PS1_ACTIVE                0x00000000
-+#define defCRTC_PS1_NACTIVE               0x00000000
-+#define defCRTC_GCLK_EXT                  0x00000000
-+#define defCRTC_ALW                       0x00000000
-+#define defCRTC_ALW_VPOS                  0x00000000
-+#define defCRTC_PSK                       0x00000000
-+#define defCRTC_PSK_HPOS                  0x00000000
-+#define defCRTC_CV4_START                 0x00000000
-+#define defCRTC_CV4_END                   0x00000000
-+#define defCRTC_CV4_HPOS                  0x00000000
-+#define defCRTC_ECK                       0x00000000
-+#define defREFRESH_CNTL                   0x00000000
-+#define defGENLCD_CNTL3                   0x000002aa
-+#define defGPIO_DATA2                     0x00000000
-+#define defGPIO_CNTL3                     0x00000000
-+#define defGPIO_CNTL4                     0x00000000
-+#define defCHIP_STRAP                     0x00000000
-+#define defDISP_DEBUG2                    0x00000000
-+#define defDEBUG_BUS_CNTL                 0x00000000
-+#define defGAMMA_VALUE1                   0x00000000
-+#define defGAMMA_VALUE2                   0x00000000
-+#define defGAMMA_SLOPE                    0x00000000
-+#define defGEN_STATUS                     0x00000000
-+#define defHW_INT                         0x00000000
-+#define defDST_OFFSET                     0x00000000
-+#define defDST_PITCH                      0x00000000
-+#define defDST_PITCH_OFFSET               0x00000000
-+#define defDST_X                          0x00000000
-+#define defDST_Y                          0x00000000
-+#define defDST_X_Y                        0x00000000
-+#define defDST_Y_X                        0x00000000
-+#define defDST_WIDTH                      0x00000000
-+#define defDST_HEIGHT                     0x00000000
-+#define defDST_WIDTH_HEIGHT               0x00000000
-+#define defDST_HEIGHT_WIDTH               0x00000000
-+#define defDST_HEIGHT_WIDTH_8             0x00000000
-+#define defDST_HEIGHT_Y                   0x00000000
-+#define defDST_WIDTH_X                    0x00000000
-+#define defDST_WIDTH_X_INCY               0x00000000
-+#define defDST_LINE_START                 0x00000000
-+#define defDST_LINE_END                   0x00000000
-+#define defBRUSH_OFFSET                   0x00000000
-+#define defBRUSH_Y_X                      0x00000000
-+#define defDP_BRUSH_FRGD_CLR              0x00000000
-+#define defDP_BRUSH_BKGD_CLR              0x00000000
-+#define defSRC2_OFFSET                    0x00000000
-+#define defSRC2_PITCH                     0x00000000
-+#define defSRC2_PITCH_OFFSET              0x00000000
-+#define defSRC2_X                         0x00000000
-+#define defSRC2_Y                         0x00000000
-+#define defSRC2_X_Y                       0x00000000
-+#define defSRC2_WIDTH                     0x00000000
-+#define defSRC2_HEIGHT                    0x00000000
-+#define defSRC2_INC                       0x00000000
-+#define defSRC_OFFSET                     0x00000000
-+#define defSRC_PITCH                      0x00000000
-+#define defSRC_PITCH_OFFSET               0x00000000
-+#define defSRC_X                          0x00000000
-+#define defSRC_Y                          0x00000000
-+#define defSRC_X_Y                        0x00000000
-+#define defSRC_Y_X                        0x00000000
-+#define defSRC_WIDTH                      0x00000000
-+#define defSRC_HEIGHT                     0x00000000
-+#define defSRC_INC                        0x00000000
-+#define defHOST_DATA0                     0x00000000
-+#define defHOST_DATA1                     0x00000000
-+#define defHOST_DATA2                     0x00000000
-+#define defHOST_DATA3                     0x00000000
-+#define defHOST_DATA4                     0x00000000
-+#define defHOST_DATA5                     0x00000000
-+#define defHOST_DATA6                     0x00000000
-+#define defHOST_DATA7                     0x00000000
-+#define defHOST_DATA_LAST                 0x00000000
-+#define defDP_SRC_FRGD_CLR                0x00000000
-+#define defDP_SRC_BKGD_CLR                0x00000000
-+#define defSC_LEFT                        0x00000000
-+#define defSC_RIGHT                       0x00000000
-+#define defSC_TOP                         0x00000000
-+#define defSC_BOTTOM                      0x00000000
-+#define defSRC_SC_RIGHT                   0x00000000
-+#define defSRC_SC_BOTTOM                  0x00000000
-+#define defDP_CNTL                        0x00000000
-+#define defDP_CNTL_DST_DIR                0x00000000
-+#define defDP_DATATYPE                    0x00000000
-+#define defDP_MIX                         0x00000000
-+#define defDP_WRITE_MSK                   0x00000000
-+#define defCLR_CMP_CLR_SRC                0x00000000
-+#define defCLR_CMP_CLR_DST                0x00000000
-+#define defCLR_CMP_CNTL                   0x00000000
-+#define defCLR_CMP_MSK                    0x00000000
-+#define defDEFAULT_PITCH_OFFSET           0x00000000
-+#define defDEFAULT_SC_BOTTOM_RIGHT        0x00000000
-+#define defDEFAULT2_SC_BOTTOM_RIGHT       0x00000000
-+#define defREF1_PITCH_OFFSET              0x00000000
-+#define defREF2_PITCH_OFFSET              0x00000000
-+#define defREF3_PITCH_OFFSET              0x00000000
-+#define defREF4_PITCH_OFFSET              0x00000000
-+#define defREF5_PITCH_OFFSET              0x00000000
-+#define defREF6_PITCH_OFFSET              0x00000000
-+#define defDP_GUI_MASTER_CNTL             0x00000000
-+#define defSC_TOP_LEFT                    0x00000000
-+#define defSC_BOTTOM_RIGHT                0x00000000
-+#define defSRC_SC_BOTTOM_RIGHT            0x00000000
-+#define defGLOBAL_ALPHA                   0x00000000
-+#define defFILTER_COEF                    0x00000000
-+#define defMVC_CNTL_START                 0x00000000
-+#define defE2_ARITHMETIC_CNTL             0x00000000
-+#define defDEBUG0                         0x00000000
-+#define defDEBUG1                         0x00000000
-+#define defDEBUG2                         0x00000000
-+#define defDEBUG3                         0x00000000
-+#define defDEBUG4                         0x00000000
-+#define defDEBUG5                         0x00000000
-+#define defDEBUG6                         0x00000000
-+#define defDEBUG7                         0x00000000
-+#define defDEBUG8                         0x00000000
-+#define defDEBUG9                         0x00000000
-+#define defDEBUG10                        0x00000000
-+#define defDEBUG11                        0x00000000
-+#define defDEBUG12                        0x00000000
-+#define defDEBUG13                        0x00000000
-+#define defDEBUG14                        0x00000000
-+#define defDEBUG15                        0x00000000
-+#define defENG_CNTL                       0x00000003
-+#define defENG_PERF_CNT                   0x00000000
-+#define defIDCT_RUNS                      0x00000000
-+#define defIDCT_LEVELS                    0x00000000
-+#define defIDCT_CONTROL                   0x00000000
-+#define defIDCT_AUTH_CONTROL              0x00000000
-+#define defIDCT_AUTH                      0x00000000
-+#define defMEM_CNTL                       0x00000006
-+#define defMEM_ARB                        0x00000000
-+#define defMC_FB_LOCATION                 0x00ff0000
-+#define defMEM_EXT_CNTL                   0x00040010
-+#define defMC_EXT_MEM_LOCATION            0x07ff0000
-+#define defMEM_EXT_TIMING_CNTL            0x00140c73
-+#define defMEM_SDRAM_MODE_REG             0x00050000
-+#define defMEM_IO_CNTL                    0x00ff00ff
-+#define defMC_DEBUG                       0x00000000
-+#define defMC_BIST_CTRL                   0x00000000
-+#define defMC_BIST_COLLAR_READ            0x00000000
-+#define defTC_MISMATCH                    0x00000000
-+#define defMC_PERF_MON_CNTL               0x00000000
-+#define defMC_PERF_COUNTERS               0x00000000
-+#define defWAIT_UNTIL                     0xc5cdcdcd
-+#define defISYNC_CNTL                     0x00000000
-+#define defRBBM_GUICNTL                   0x00000000
-+#define defRBBM_STATUS                    0x81cdcd40
-+#define defRBBM_CNTL                      0x0000000f
-+#define defRBBM_SOFT_RESET                0x00000000
-+#define defNQWAIT_UNTIL                   0x00000001
-+#define defRBBM_DEBUG                     0x00000000
-+#define defRBBM_CMDFIFO_ADDR              0x0000000d
-+#define defRBBM_CMDFIFO_DATAL             0xcdcdcdcd
-+#define defRBBM_CMDFIFO_DATAH             0x00000dcd
-+#define defRBBM_CMDFIFO_STAT              0x00000d0d
-+#define defCLK_PIN_CNTL                   0x0000003f
-+#define defPLL_REF_FB_DIV                 0x5a500000
-+#define defPLL_CNTL                       0x4b000203
-+#define defSCLK_CNTL                      0x00ff0300
-+#define defPCLK_CNTL                      0x00010000
-+#define defCLK_TEST_CNTL                  0x00000000
-+#define defPWRMGT_CNTL                    0x00000004
-+#define defPWRMGT_STATUS                  0x00000001
-+
-+#define CFG_BASE_BOOT_DEFAULT  0x0
-+#define CFG_BASE_VALUE         0x0
-+#define REG_BASE_BOOT_DEFAULT  0x01
-+#define REG_BASE_VALUE         0x10000
-+#define MEM_INT_BASE_VALUE     0x100000
-+#define MEM_INT_TOP_VALUE_W100 0x15ffff
-+#define MEM_EXT_BASE_VALUE     0x800000
-+#define MEM_EXT_TOP_VALUE      0x9fffff
-+#define WRAP_BUF_BASE_VALUE    0x80000
-+#define WRAP_BUF_TOP_VALUE     0xbffff
-+
-+
-+/* data structure definitions */
-+
-+typedef struct _chip_id_t {
-+     unsigned long vendor_id                      : 16;
-+     unsigned long device_id                      : 16;
-+     } chip_id_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     chip_id_t f;
-+} chip_id_u;
-+
-+typedef struct _revision_id_t {
-+     unsigned long minor_rev_id                   : 4;
-+     unsigned long major_rev_id                   : 4;
-+     unsigned long                                : 24;
-+     } revision_id_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     revision_id_t f;
-+} revision_id_u;
-+
-+typedef struct _wrap_buf_a_t {
-+     unsigned long offset_addr_a                  : 24;
-+     unsigned long block_size_a                   : 3;
-+     unsigned long                                : 5;
-+     } wrap_buf_a_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     wrap_buf_a_t f;
-+} wrap_buf_a_u;
-+
-+typedef struct _wrap_buf_b_t {
-+     unsigned long offset_addr_b                  : 24;
-+     unsigned long block_size_b                   : 3;
-+     unsigned long                                : 5;
-+     } wrap_buf_b_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     wrap_buf_b_t f;
-+} wrap_buf_b_u;
-+
-+typedef struct _wrap_top_dir_t {
-+     unsigned long top_addr                       : 23;
-+     unsigned long                                : 9;
-+     } wrap_top_dir_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     wrap_top_dir_t f;
-+} wrap_top_dir_u;
-+
-+typedef struct _wrap_start_dir_t {
-+     unsigned long start_addr                     : 23;
-+     unsigned long                                : 9;
-+     } wrap_start_dir_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     wrap_start_dir_t f;
-+} wrap_start_dir_u;
-+
-+typedef struct _cif_cntl_t {
-+     unsigned long swap_reg                       : 2;
-+     unsigned long swap_fbuf_1                    : 2;
-+     unsigned long swap_fbuf_2                    : 2;
-+     unsigned long swap_fbuf_3                    : 2;
-+     unsigned long pmi_int_disable                : 1;
-+     unsigned long pmi_schmen_disable             : 1;
-+     unsigned long intb_oe                        : 1;
-+     unsigned long en_wait_to_compensate_dq_prop_dly : 1;
-+     unsigned long compensate_wait_rd_size        : 2;
-+     unsigned long wait_asserted_timeout_val      : 2;
-+     unsigned long wait_masked_val                : 2;
-+     unsigned long en_wait_timeout                : 1;
-+     unsigned long en_one_clk_setup_before_wait   : 1;
-+     unsigned long interrupt_active_high          : 1;
-+     unsigned long en_overwrite_straps            : 1;
-+     unsigned long strap_wait_active_hi           : 1;
-+     unsigned long lat_busy_count                 : 2;
-+     unsigned long lat_rd_pm4_sclk_busy           : 1;
-+     unsigned long dis_system_bits                : 1;
-+     unsigned long dis_mr                         : 1;
-+     unsigned long cif_spare_1                    : 4;
-+     } cif_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cif_cntl_t f;
-+} cif_cntl_u;
-+
-+typedef struct _cfgreg_base_t {
-+     unsigned long cfgreg_base                    : 24;
-+     unsigned long                                : 8;
-+     } cfgreg_base_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cfgreg_base_t f;
-+} cfgreg_base_u;
-+
-+typedef struct _cif_io_t {
-+     unsigned long dq_srp                         : 1;
-+     unsigned long dq_srn                         : 1;
-+     unsigned long dq_sp                          : 4;
-+     unsigned long dq_sn                          : 4;
-+     unsigned long waitb_srp                      : 1;
-+     unsigned long waitb_srn                      : 1;
-+     unsigned long waitb_sp                       : 4;
-+     unsigned long waitb_sn                       : 4;
-+     unsigned long intb_srp                       : 1;
-+     unsigned long intb_srn                       : 1;
-+     unsigned long intb_sp                        : 4;
-+     unsigned long intb_sn                        : 4;
-+     unsigned long                                : 2;
-+     } cif_io_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cif_io_t f;
-+} cif_io_u;
-+
-+typedef struct _cif_read_dbg_t {
-+     unsigned long unpacker_pre_fetch_trig_gen    : 2;
-+     unsigned long dly_second_rd_fetch_trig       : 1;
-+     unsigned long rst_rd_burst_id                : 1;
-+     unsigned long dis_rd_burst_id                : 1;
-+     unsigned long en_block_rd_when_packer_is_not_emp : 1;
-+     unsigned long dis_pre_fetch_cntl_sm          : 1;
-+     unsigned long rbbm_chrncy_dis                : 1;
-+     unsigned long rbbm_rd_after_wr_lat           : 2;
-+     unsigned long dis_be_during_rd               : 1;
-+     unsigned long one_clk_invalidate_pulse       : 1;
-+     unsigned long dis_chnl_priority              : 1;
-+     unsigned long rst_read_path_a_pls            : 1;
-+     unsigned long rst_read_path_b_pls            : 1;
-+     unsigned long dis_reg_rd_fetch_trig          : 1;
-+     unsigned long dis_rd_fetch_trig_from_ind_addr : 1;
-+     unsigned long dis_rd_same_byte_to_trig_fetch : 1;
-+     unsigned long dis_dir_wrap                   : 1;
-+     unsigned long dis_ring_buf_to_force_dec      : 1;
-+     unsigned long dis_addr_comp_in_16bit         : 1;
-+     unsigned long clr_w                          : 1;
-+     unsigned long err_rd_tag_is_3                : 1;
-+     unsigned long err_load_when_ful_a            : 1;
-+     unsigned long err_load_when_ful_b            : 1;
-+     unsigned long                                : 7;
-+     } cif_read_dbg_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cif_read_dbg_t f;
-+} cif_read_dbg_u;
-+
-+typedef struct _cif_write_dbg_t {
-+     unsigned long packer_timeout_count           : 2;
-+     unsigned long en_upper_load_cond             : 1;
-+     unsigned long en_chnl_change_cond            : 1;
-+     unsigned long dis_addr_comp_cond             : 1;
-+     unsigned long dis_load_same_byte_addr_cond   : 1;
-+     unsigned long dis_timeout_cond               : 1;
-+     unsigned long dis_timeout_during_rbbm        : 1;
-+     unsigned long dis_packer_ful_during_rbbm_timeout : 1;
-+     unsigned long en_dword_split_to_rbbm         : 1;
-+     unsigned long en_dummy_val                   : 1;
-+     unsigned long dummy_val_sel                  : 1;
-+     unsigned long mask_pm4_wrptr_dec             : 1;
-+     unsigned long dis_mc_clean_cond              : 1;
-+     unsigned long err_two_reqi_during_ful        : 1;
-+     unsigned long err_reqi_during_idle_clk       : 1;
-+     unsigned long err_global                     : 1;
-+     unsigned long en_wr_buf_dbg_load             : 1;
-+     unsigned long en_wr_buf_dbg_path             : 1;
-+     unsigned long sel_wr_buf_byte                : 3;
-+     unsigned long dis_rd_flush_wr                : 1;
-+     unsigned long dis_packer_ful_cond            : 1;
-+     unsigned long dis_invalidate_by_ops_chnl     : 1;
-+     unsigned long en_halt_when_reqi_err          : 1;
-+     unsigned long cif_spare_2                    : 5;
-+     unsigned long                                : 1;
-+     } cif_write_dbg_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cif_write_dbg_t f;
-+} cif_write_dbg_u;
-+
-+typedef struct _ind_addr_a_0_t {
-+     unsigned char ind_addr_a_0                   : 8;
-+     } ind_addr_a_0_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_addr_a_0_t f;
-+} ind_addr_a_0_u;
-+
-+typedef struct _ind_addr_a_1_t {
-+     unsigned char ind_addr_a_1                   : 8;
-+     } ind_addr_a_1_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_addr_a_1_t f;
-+} ind_addr_a_1_u;
-+
-+typedef struct _ind_addr_a_2_t {
-+     unsigned char ind_addr_a_2                   : 8;
-+     } ind_addr_a_2_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_addr_a_2_t f;
-+} ind_addr_a_2_u;
-+
-+typedef struct _ind_data_a_t {
-+     unsigned char ind_data_a                     : 8;
-+     } ind_data_a_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_data_a_t f;
-+} ind_data_a_u;
-+
-+typedef struct _reg_base_t {
-+     unsigned char reg_base                       : 8;
-+     } reg_base_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     reg_base_t f;
-+} reg_base_u;
-+
-+typedef struct _intf_cntl_t {
-+     unsigned char ad_inc_a                       : 1;
-+     unsigned char ring_buf_a                     : 1;
-+     unsigned char rd_fetch_trigger_a             : 1;
-+     unsigned char rd_data_rdy_a                  : 1;
-+     unsigned char ad_inc_b                       : 1;
-+     unsigned char ring_buf_b                     : 1;
-+     unsigned char rd_fetch_trigger_b             : 1;
-+     unsigned char rd_data_rdy_b                  : 1;
-+     } intf_cntl_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     intf_cntl_t f;
-+} intf_cntl_u;
-+
-+typedef struct _status_t {
-+     unsigned char wr_fifo_available_space        : 2;
-+     unsigned char fbuf_wr_pipe_emp               : 1;
-+     unsigned char soft_reset                     : 1;
-+     unsigned char system_pwm_mode                : 2;
-+     unsigned char mem_access_dis                 : 1;
-+     unsigned char en_pre_fetch                   : 1;
-+     } status_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     status_t f;
-+} status_u;
-+
-+typedef struct _cpu_defaults_t {
-+     unsigned char unpack_rd_data                 : 1;
-+     unsigned char access_ind_addr_a              : 1;
-+     unsigned char access_ind_addr_b              : 1;
-+     unsigned char access_scratch_reg             : 1;
-+     unsigned char pack_wr_data                   : 1;
-+     unsigned char transition_size                : 1;
-+     unsigned char en_read_buf_mode               : 1;
-+     unsigned char rd_fetch_scratch               : 1;
-+     } cpu_defaults_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     cpu_defaults_t f;
-+} cpu_defaults_u;
-+
-+typedef struct _ind_addr_b_0_t {
-+     unsigned char ind_addr_b_0                   : 8;
-+     } ind_addr_b_0_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_addr_b_0_t f;
-+} ind_addr_b_0_u;
-+
-+typedef struct _ind_addr_b_1_t {
-+     unsigned char ind_addr_b_1                   : 8;
-+     } ind_addr_b_1_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_addr_b_1_t f;
-+} ind_addr_b_1_u;
-+
-+typedef struct _ind_addr_b_2_t {
-+     unsigned char ind_addr_b_2                   : 8;
-+     } ind_addr_b_2_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_addr_b_2_t f;
-+} ind_addr_b_2_u;
-+
-+typedef struct _ind_data_b_t {
-+     unsigned char ind_data_b                     : 8;
-+     } ind_data_b_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     ind_data_b_t f;
-+} ind_data_b_u;
-+
-+typedef struct _pm4_rptr_t {
-+     unsigned char pm4_rptr                       : 8;
-+     } pm4_rptr_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     pm4_rptr_t f;
-+} pm4_rptr_u;
-+
-+typedef struct _scratch_t {
-+     unsigned char scratch                        : 8;
-+     } scratch_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     scratch_t f;
-+} scratch_u;
-+
-+typedef struct _pm4_wrptr_0_t {
-+     unsigned char pm4_wrptr_0                    : 8;
-+     } pm4_wrptr_0_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     pm4_wrptr_0_t f;
-+} pm4_wrptr_0_u;
-+
-+typedef struct _pm4_wrptr_1_t {
-+     unsigned char pm4_wrptr_1                    : 6;
-+     unsigned char rd_fetch_pm4_rptr              : 1;
-+     unsigned char wrptr_atomic_update_w          : 1;
-+     } pm4_wrptr_1_t;
-+
-+typedef union {
-+     unsigned char val : 8;
-+     pm4_wrptr_1_t f;
-+} pm4_wrptr_1_u;
-+
-+typedef struct _cp_rb_cntl_t {
-+     unsigned long rb_bufsz                       : 6;
-+     unsigned long                                : 2;
-+     unsigned long rb_blksz                       : 6;
-+     unsigned long                                : 2;
-+     unsigned long buf_swap                       : 2;
-+     unsigned long max_fetch                      : 2;
-+     unsigned long                                : 7;
-+     unsigned long rb_no_update                   : 1;
-+     unsigned long                                : 3;
-+     unsigned long rb_rptr_wr_ena                 : 1;
-+     } cp_rb_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_rb_cntl_t f;
-+} cp_rb_cntl_u;
-+
-+typedef struct _cp_rb_base_t {
-+     unsigned long                                : 2;
-+     unsigned long rb_base                        : 22;
-+     unsigned long                                : 8;
-+     } cp_rb_base_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_rb_base_t f;
-+} cp_rb_base_u;
-+
-+typedef struct _cp_rb_rptr_addr_t {
-+     unsigned long rb_rptr_swap                   : 2;
-+     unsigned long rb_rptr_addr                   : 22;
-+     unsigned long                                : 8;
-+     } cp_rb_rptr_addr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_rb_rptr_addr_t f;
-+} cp_rb_rptr_addr_u;
-+
-+typedef struct _cp_rb_rptr_t {
-+     unsigned long rb_rptr                        : 23;
-+     unsigned long                                : 9;
-+     } cp_rb_rptr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_rb_rptr_t f;
-+} cp_rb_rptr_u;
-+
-+typedef struct _cp_rb_rptr_wr_t {
-+     unsigned long rb_rptr_wr                     : 23;
-+     unsigned long                                : 9;
-+     } cp_rb_rptr_wr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_rb_rptr_wr_t f;
-+} cp_rb_rptr_wr_u;
-+
-+typedef struct _cp_rb_wptr_t {
-+     unsigned long rb_wptr                        : 23;
-+     unsigned long                                : 9;
-+     } cp_rb_wptr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_rb_wptr_t f;
-+} cp_rb_wptr_u;
-+
-+typedef struct _cp_ib_base_t {
-+     unsigned long                                : 2;
-+     unsigned long ib_base                        : 22;
-+     unsigned long                                : 8;
-+     } cp_ib_base_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_ib_base_t f;
-+} cp_ib_base_u;
-+
-+typedef struct _cp_ib_bufsz_t {
-+     unsigned long ib_bufsz                       : 23;
-+     unsigned long                                : 9;
-+     } cp_ib_bufsz_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_ib_bufsz_t f;
-+} cp_ib_bufsz_u;
-+
-+typedef struct _cp_csq_cntl_t {
-+     unsigned long csq_cnt_primary                : 8;
-+     unsigned long csq_cnt_indirect               : 8;
-+     unsigned long                                : 12;
-+     unsigned long csq_mode                       : 4;
-+     } cp_csq_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_csq_cntl_t f;
-+} cp_csq_cntl_u;
-+
-+typedef struct _cp_csq_aper_primary_t {
-+     unsigned long cp_csq_aper_primary            : 32;
-+     } cp_csq_aper_primary_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_csq_aper_primary_t f;
-+} cp_csq_aper_primary_u;
-+
-+typedef struct _cp_csq_aper_indirect_t {
-+     unsigned long cp_csq_aper_indirect           : 32;
-+     } cp_csq_aper_indirect_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_csq_aper_indirect_t f;
-+} cp_csq_aper_indirect_u;
-+
-+typedef struct _cp_me_cntl_t {
-+     unsigned long me_stat                        : 16;
-+     unsigned long me_statmux                     : 5;
-+     unsigned long                                : 8;
-+     unsigned long me_busy                        : 1;
-+     unsigned long me_mode                        : 1;
-+     unsigned long me_step                        : 1;
-+     } cp_me_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_me_cntl_t f;
-+} cp_me_cntl_u;
-+
-+typedef struct _cp_me_ram_addr_t {
-+     unsigned long me_ram_addr                    : 8;
-+     unsigned long                                : 24;
-+     } cp_me_ram_addr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_me_ram_addr_t f;
-+} cp_me_ram_addr_u;
-+
-+typedef struct _cp_me_ram_raddr_t {
-+     unsigned long me_ram_raddr                   : 8;
-+     unsigned long                                : 24;
-+     } cp_me_ram_raddr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_me_ram_raddr_t f;
-+} cp_me_ram_raddr_u;
-+
-+typedef struct _cp_me_ram_datah_t {
-+     unsigned long me_ram_datah                   : 6;
-+     unsigned long                                : 26;
-+     } cp_me_ram_datah_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_me_ram_datah_t f;
-+} cp_me_ram_datah_u;
-+
-+typedef struct _cp_me_ram_datal_t {
-+     unsigned long me_ram_datal                   : 32;
-+     } cp_me_ram_datal_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_me_ram_datal_t f;
-+} cp_me_ram_datal_u;
-+
-+typedef struct _cp_debug_t {
-+     unsigned long cp_debug                       : 32;
-+     } cp_debug_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_debug_t f;
-+} cp_debug_u;
-+
-+typedef struct _scratch_reg0_t {
-+     unsigned long scratch_reg0                   : 32;
-+     } scratch_reg0_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_reg0_t f;
-+} scratch_reg0_u;
-+
-+typedef struct _scratch_reg1_t {
-+     unsigned long scratch_reg1                   : 32;
-+     } scratch_reg1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_reg1_t f;
-+} scratch_reg1_u;
-+
-+typedef struct _scratch_reg2_t {
-+     unsigned long scratch_reg2                   : 32;
-+     } scratch_reg2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_reg2_t f;
-+} scratch_reg2_u;
-+
-+typedef struct _scratch_reg3_t {
-+     unsigned long scratch_reg3                   : 32;
-+     } scratch_reg3_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_reg3_t f;
-+} scratch_reg3_u;
-+
-+typedef struct _scratch_reg4_t {
-+     unsigned long scratch_reg4                   : 32;
-+     } scratch_reg4_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_reg4_t f;
-+} scratch_reg4_u;
-+
-+typedef struct _scratch_reg5_t {
-+     unsigned long scratch_reg5                   : 32;
-+     } scratch_reg5_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_reg5_t f;
-+} scratch_reg5_u;
-+
-+typedef struct _scratch_umsk_t {
-+     unsigned long scratch_umsk                   : 6;
-+     unsigned long                                : 10;
-+     unsigned long scratch_swap                   : 2;
-+     unsigned long                                : 14;
-+     } scratch_umsk_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_umsk_t f;
-+} scratch_umsk_u;
-+
-+typedef struct _scratch_addr_t {
-+     unsigned long                                : 5;
-+     unsigned long scratch_addr                   : 27;
-+     } scratch_addr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     scratch_addr_t f;
-+} scratch_addr_u;
-+
-+typedef struct _cp_csq_addr_t {
-+     unsigned long                                : 2;
-+     unsigned long csq_addr                       : 8;
-+     unsigned long                                : 22;
-+     } cp_csq_addr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_csq_addr_t f;
-+} cp_csq_addr_u;
-+
-+typedef struct _cp_csq_data_t {
-+     unsigned long csq_data                       : 32;
-+     } cp_csq_data_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_csq_data_t f;
-+} cp_csq_data_u;
-+
-+typedef struct _cp_csq_stat_t {
-+     unsigned long csq_rptr_primary               : 8;
-+     unsigned long csq_wptr_primary               : 8;
-+     unsigned long csq_rptr_indirect              : 8;
-+     unsigned long csq_wptr_indirect              : 8;
-+     } cp_csq_stat_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_csq_stat_t f;
-+} cp_csq_stat_u;
-+
-+typedef struct _cp_stat_t {
-+     unsigned long mru_busy                       : 1;
-+     unsigned long mwu_busy                       : 1;
-+     unsigned long rsiu_busy                      : 1;
-+     unsigned long rciu_busy                      : 1;
-+     unsigned long                                : 5;
-+     unsigned long csf_primary_busy               : 1;
-+     unsigned long csf_indirect_busy              : 1;
-+     unsigned long csq_primary_busy               : 1;
-+     unsigned long csq_indirect_busy              : 1;
-+     unsigned long csi_busy                       : 1;
-+     unsigned long                                : 14;
-+     unsigned long guidma_busy                    : 1;
-+     unsigned long viddma_busy                    : 1;
-+     unsigned long cmdstrm_busy                   : 1;
-+     unsigned long cp_busy                        : 1;
-+     } cp_stat_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cp_stat_t f;
-+} cp_stat_u;
-+
-+typedef struct _gen_int_cntl_t {
-+     unsigned long crtc_vblank_mask               : 1;
-+     unsigned long crtc_vline_mask                : 1;
-+     unsigned long crtc_hwint1_mask               : 1;
-+     unsigned long crtc_hwint2_mask               : 1;
-+     unsigned long                                : 15;
-+     unsigned long gui_idle_mask                  : 1;
-+     unsigned long                                : 8;
-+     unsigned long pm4_idle_int_mask              : 1;
-+     unsigned long dvi_i2c_int_mask               : 1;
-+     unsigned long                                : 2;
-+     } gen_int_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gen_int_cntl_t f;
-+} gen_int_cntl_u;
-+
-+typedef struct _gen_int_status_rd_t {
-+     unsigned long crtc_vblank_stat               : 1;
-+     unsigned long crtc_vline_stat                : 1;
-+     unsigned long crtc_hwint1_stat               : 1;
-+     unsigned long crtc_hwint2_stat               : 1;
-+     unsigned long                                : 15;
-+     unsigned long gui_idle_stat                  : 1;
-+     unsigned long                                : 8;
-+     unsigned long pm4_idle_int_stat              : 1;
-+     unsigned long dvi_i2c_int_stat               : 1;
-+     unsigned long                                : 2;
-+     } gen_int_status_rd_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gen_int_status_rd_t f;
-+} gen_int_status_rd_u;
-+
-+typedef struct _gen_int_status_wr_t {
-+     unsigned long crtc_vblank_stat_ak            : 1;
-+     unsigned long crtc_vline_stat_ak             : 1;
-+     unsigned long crtc_hwint1_stat_ak            : 1;
-+     unsigned long crtc_hwint2_stat_ak            : 1;
-+     unsigned long                                : 15;
-+     unsigned long gui_idle_stat_ak               : 1;
-+     unsigned long                                : 8;
-+     unsigned long pm4_idle_int_ak                : 1;
-+     unsigned long dvi_i2c_int_ak                 : 1;
-+     unsigned long                                : 2;
-+     } gen_int_status_wr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gen_int_status_wr_t f;
-+} gen_int_status_wr_u;
-+
-+typedef struct _lcd_format_t {
-+     unsigned long lcd_type                       : 4;
-+     unsigned long color_to_mono                  : 1;
-+     unsigned long data_inv                       : 1;
-+     unsigned long stn_fm                         : 2;
-+     unsigned long tft_fm                         : 2;
-+     unsigned long scan_lr_en                     : 1;
-+     unsigned long scan_ud_en                     : 1;
-+     unsigned long pol_inv                        : 1;
-+     unsigned long rst_fm                         : 1;
-+     unsigned long yuv_to_rgb                     : 1;
-+     unsigned long hr_tft                         : 1;
-+     unsigned long ulc_panel                      : 1;
-+     unsigned long                                : 15;
-+     } lcd_format_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     lcd_format_t f;
-+} lcd_format_u;
-+
-+typedef struct _graphic_ctrl_t {
-+     unsigned long color_depth                    : 3;
-+     unsigned long portrait_mode                  : 2;
-+     unsigned long low_power_on                   : 1;
-+     unsigned long req_freq                       : 4;
-+     unsigned long en_crtc                        : 1;
-+     unsigned long en_graphic_req                 : 1;
-+     unsigned long en_graphic_crtc                : 1;
-+     unsigned long total_req_graphic              : 9;
-+     unsigned long lcd_pclk_on                    : 1;
-+     unsigned long lcd_sclk_on                    : 1;
-+     unsigned long pclk_running                   : 1;
-+     unsigned long sclk_running                   : 1;
-+     unsigned long                                : 6;
-+     } graphic_ctrl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     graphic_ctrl_t f;
-+} graphic_ctrl_u;
-+
-+typedef struct _graphic_offset_t {
-+     unsigned long graphic_offset                 : 24;
-+     unsigned long                                : 8;
-+     } graphic_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     graphic_offset_t f;
-+} graphic_offset_u;
-+
-+typedef struct _graphic_pitch_t {
-+     unsigned long graphic_pitch                  : 11;
-+     unsigned long                                : 21;
-+     } graphic_pitch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     graphic_pitch_t f;
-+} graphic_pitch_u;
-+
-+typedef struct _crtc_total_t {
-+     unsigned long crtc_h_total                   : 10;
-+     unsigned long                                : 6;
-+     unsigned long crtc_v_total                   : 10;
-+     unsigned long                                : 6;
-+     } crtc_total_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_total_t f;
-+} crtc_total_u;
-+
-+typedef struct _active_h_disp_t {
-+     unsigned long active_h_start                 : 10;
-+     unsigned long                                : 6;
-+     unsigned long active_h_end                   : 10;
-+     unsigned long                                : 6;
-+     } active_h_disp_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     active_h_disp_t f;
-+} active_h_disp_u;
-+
-+typedef struct _active_v_disp_t {
-+     unsigned long active_v_start                 : 10;
-+     unsigned long                                : 6;
-+     unsigned long active_v_end                   : 10;
-+     unsigned long                                : 6;
-+     } active_v_disp_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     active_v_disp_t f;
-+} active_v_disp_u;
-+
-+typedef struct _graphic_h_disp_t {
-+     unsigned long graphic_h_start                : 10;
-+     unsigned long                                : 6;
-+     unsigned long graphic_h_end                  : 10;
-+     unsigned long                                : 6;
-+     } graphic_h_disp_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     graphic_h_disp_t f;
-+} graphic_h_disp_u;
-+
-+typedef struct _graphic_v_disp_t {
-+     unsigned long graphic_v_start                : 10;
-+     unsigned long                                : 6;
-+     unsigned long graphic_v_end                  : 10;
-+     unsigned long                                : 6;
-+     } graphic_v_disp_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     graphic_v_disp_t f;
-+} graphic_v_disp_u;
-+
-+typedef struct _video_ctrl_t {
-+     unsigned long video_mode                     : 1;
-+     unsigned long keyer_en                       : 1;
-+     unsigned long en_video_req                   : 1;
-+     unsigned long en_graphic_req_video           : 1;
-+     unsigned long en_video_crtc                  : 1;
-+     unsigned long video_hor_exp                  : 2;
-+     unsigned long video_ver_exp                  : 2;
-+     unsigned long uv_combine                     : 1;
-+     unsigned long total_req_video                : 9;
-+     unsigned long video_ch_sel                   : 1;
-+     unsigned long video_portrait                 : 2;
-+     unsigned long yuv2rgb_en                     : 1;
-+     unsigned long yuv2rgb_option                 : 1;
-+     unsigned long video_inv_hor                  : 1;
-+     unsigned long video_inv_ver                  : 1;
-+     unsigned long gamma_sel                      : 2;
-+     unsigned long dis_limit                      : 1;
-+     unsigned long en_uv_hblend                   : 1;
-+     unsigned long rgb_gamma_sel                  : 2;
-+     } video_ctrl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_ctrl_t f;
-+} video_ctrl_u;
-+
-+typedef struct _graphic_key_t {
-+     unsigned long keyer_color                    : 16;
-+     unsigned long keyer_mask                     : 16;
-+     } graphic_key_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     graphic_key_t f;
-+} graphic_key_u;
-+
-+typedef struct _video_y_offset_t {
-+     unsigned long y_offset                       : 24;
-+     unsigned long                                : 8;
-+     } video_y_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_y_offset_t f;
-+} video_y_offset_u;
-+
-+typedef struct _video_y_pitch_t {
-+     unsigned long y_pitch                        : 11;
-+     unsigned long                                : 21;
-+     } video_y_pitch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_y_pitch_t f;
-+} video_y_pitch_u;
-+
-+typedef struct _video_u_offset_t {
-+     unsigned long u_offset                       : 24;
-+     unsigned long                                : 8;
-+     } video_u_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_u_offset_t f;
-+} video_u_offset_u;
-+
-+typedef struct _video_u_pitch_t {
-+     unsigned long u_pitch                        : 11;
-+     unsigned long                                : 21;
-+     } video_u_pitch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_u_pitch_t f;
-+} video_u_pitch_u;
-+
-+typedef struct _video_v_offset_t {
-+     unsigned long v_offset                       : 24;
-+     unsigned long                                : 8;
-+     } video_v_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_v_offset_t f;
-+} video_v_offset_u;
-+
-+typedef struct _video_v_pitch_t {
-+     unsigned long v_pitch                        : 11;
-+     unsigned long                                : 21;
-+     } video_v_pitch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_v_pitch_t f;
-+} video_v_pitch_u;
-+
-+typedef struct _video_h_pos_t {
-+     unsigned long video_h_start                  : 10;
-+     unsigned long                                : 6;
-+     unsigned long video_h_end                    : 10;
-+     unsigned long                                : 6;
-+     } video_h_pos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_h_pos_t f;
-+} video_h_pos_u;
-+
-+typedef struct _video_v_pos_t {
-+     unsigned long video_v_start                  : 10;
-+     unsigned long                                : 6;
-+     unsigned long video_v_end                    : 10;
-+     unsigned long                                : 6;
-+     } video_v_pos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     video_v_pos_t f;
-+} video_v_pos_u;
-+
-+typedef struct _brightness_cntl_t {
-+     unsigned long brightness                     : 7;
-+     unsigned long                                : 25;
-+     } brightness_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     brightness_cntl_t f;
-+} brightness_cntl_u;
-+
-+typedef struct _cursor1_offset_t {
-+     unsigned long cur1_offset                    : 24;
-+     unsigned long cur1_x_offset                  : 4;
-+     unsigned long cur1_y_offset                  : 4;
-+     } cursor1_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor1_offset_t f;
-+} cursor1_offset_u;
-+
-+typedef struct _cursor1_h_pos_t {
-+     unsigned long cur1_h_start                   : 10;
-+     unsigned long                                : 6;
-+     unsigned long cur1_h_end                     : 10;
-+     unsigned long                                : 5;
-+     unsigned long cur1_en                        : 1;
-+     } cursor1_h_pos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor1_h_pos_t f;
-+} cursor1_h_pos_u;
-+
-+typedef struct _cursor1_v_pos_t {
-+     unsigned long cur1_v_start                   : 10;
-+     unsigned long                                : 6;
-+     unsigned long cur1_v_end                     : 10;
-+     unsigned long                                : 6;
-+     } cursor1_v_pos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor1_v_pos_t f;
-+} cursor1_v_pos_u;
-+
-+typedef struct _cursor1_color0_t {
-+     unsigned long cur1_color0_r                  : 8;
-+     unsigned long cur1_color0_g                  : 8;
-+     unsigned long cur1_color0_b                  : 8;
-+     unsigned long                                : 8;
-+     } cursor1_color0_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor1_color0_t f;
-+} cursor1_color0_u;
-+
-+typedef struct _cursor1_color1_t {
-+     unsigned long cur1_color1_r                  : 8;
-+     unsigned long cur1_color1_g                  : 8;
-+     unsigned long cur1_color1_b                  : 8;
-+     unsigned long                                : 8;
-+     } cursor1_color1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor1_color1_t f;
-+} cursor1_color1_u;
-+
-+typedef struct _cursor2_offset_t {
-+     unsigned long cur2_offset                    : 24;
-+     unsigned long cur2_x_offset                  : 4;
-+     unsigned long cur2_y_offset                  : 4;
-+     } cursor2_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor2_offset_t f;
-+} cursor2_offset_u;
-+
-+typedef struct _cursor2_h_pos_t {
-+     unsigned long cur2_h_start                   : 10;
-+     unsigned long                                : 6;
-+     unsigned long cur2_h_end                     : 10;
-+     unsigned long                                : 5;
-+     unsigned long cur2_en                        : 1;
-+     } cursor2_h_pos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor2_h_pos_t f;
-+} cursor2_h_pos_u;
-+
-+typedef struct _cursor2_v_pos_t {
-+     unsigned long cur2_v_start                   : 10;
-+     unsigned long                                : 6;
-+     unsigned long cur2_v_end                     : 10;
-+     unsigned long                                : 6;
-+     } cursor2_v_pos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor2_v_pos_t f;
-+} cursor2_v_pos_u;
-+
-+typedef struct _cursor2_color0_t {
-+     unsigned long cur2_color0_r                  : 8;
-+     unsigned long cur2_color0_g                  : 8;
-+     unsigned long cur2_color0_b                  : 8;
-+     unsigned long                                : 8;
-+     } cursor2_color0_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor2_color0_t f;
-+} cursor2_color0_u;
-+
-+typedef struct _cursor2_color1_t {
-+     unsigned long cur2_color1_r                  : 8;
-+     unsigned long cur2_color1_g                  : 8;
-+     unsigned long cur2_color1_b                  : 8;
-+     unsigned long                                : 8;
-+     } cursor2_color1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor2_color1_t f;
-+} cursor2_color1_u;
-+
-+typedef struct _disp_int_cntl_t {
-+     unsigned long vline_int_pos                  : 10;
-+     unsigned long                                : 6;
-+     unsigned long hpos_int_pos                   : 10;
-+     unsigned long                                : 4;
-+     unsigned long vblank_int_pol                 : 1;
-+     unsigned long frame_int_pol                  : 1;
-+     } disp_int_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     disp_int_cntl_t f;
-+} disp_int_cntl_u;
-+
-+typedef struct _crtc_ss_t {
-+     unsigned long ss_start                       : 10;
-+     unsigned long                                : 6;
-+     unsigned long ss_end                         : 10;
-+     unsigned long                                : 2;
-+     unsigned long ss_align                       : 1;
-+     unsigned long ss_pol                         : 1;
-+     unsigned long ss_run_mode                    : 1;
-+     unsigned long ss_en                          : 1;
-+     } crtc_ss_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_ss_t f;
-+} crtc_ss_u;
-+
-+typedef struct _crtc_ls_t {
-+     unsigned long ls_start                       : 10;
-+     unsigned long                                : 6;
-+     unsigned long ls_end                         : 10;
-+     unsigned long                                : 2;
-+     unsigned long ls_align                       : 1;
-+     unsigned long ls_pol                         : 1;
-+     unsigned long ls_run_mode                    : 1;
-+     unsigned long ls_en                          : 1;
-+     } crtc_ls_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_ls_t f;
-+} crtc_ls_u;
-+
-+typedef struct _crtc_rev_t {
-+     unsigned long rev_pos                        : 10;
-+     unsigned long                                : 6;
-+     unsigned long rev_align                      : 1;
-+     unsigned long rev_freq_nref                  : 5;
-+     unsigned long rev_en                         : 1;
-+     unsigned long                                : 9;
-+     } crtc_rev_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_rev_t f;
-+} crtc_rev_u;
-+
-+typedef struct _crtc_dclk_t {
-+     unsigned long dclk_start                     : 10;
-+     unsigned long                                : 6;
-+     unsigned long dclk_end                       : 10;
-+     unsigned long                                : 1;
-+     unsigned long dclk_run_mode                  : 2;
-+     unsigned long dclk_pol                       : 1;
-+     unsigned long dclk_align                     : 1;
-+     unsigned long dclk_en                        : 1;
-+     } crtc_dclk_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_dclk_t f;
-+} crtc_dclk_u;
-+
-+typedef struct _crtc_gs_t {
-+     unsigned long gs_start                       : 10;
-+     unsigned long                                : 6;
-+     unsigned long gs_end                         : 10;
-+     unsigned long                                : 3;
-+     unsigned long gs_align                       : 1;
-+     unsigned long gs_pol                         : 1;
-+     unsigned long gs_en                          : 1;
-+     } crtc_gs_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_gs_t f;
-+} crtc_gs_u;
-+
-+typedef struct _crtc_vpos_gs_t {
-+     unsigned long gs_vpos_start                  : 10;
-+     unsigned long                                : 6;
-+     unsigned long gs_vpos_end                    : 10;
-+     unsigned long                                : 6;
-+     } crtc_vpos_gs_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_vpos_gs_t f;
-+} crtc_vpos_gs_u;
-+
-+typedef struct _crtc_gclk_t {
-+     unsigned long gclk_start                     : 10;
-+     unsigned long                                : 6;
-+     unsigned long gclk_end                       : 10;
-+     unsigned long                                : 3;
-+     unsigned long gclk_align                     : 1;
-+     unsigned long gclk_pol                       : 1;
-+     unsigned long gclk_en                        : 1;
-+     } crtc_gclk_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_gclk_t f;
-+} crtc_gclk_u;
-+
-+typedef struct _crtc_goe_t {
-+     unsigned long goe_start                      : 10;
-+     unsigned long                                : 6;
-+     unsigned long goe_end                        : 10;
-+     unsigned long                                : 3;
-+     unsigned long goe_align                      : 1;
-+     unsigned long goe_pol                        : 1;
-+     unsigned long goe_en                         : 1;
-+     } crtc_goe_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_goe_t f;
-+} crtc_goe_u;
-+
-+typedef struct _crtc_frame_t {
-+     unsigned long crtc_fr_start                  : 10;
-+     unsigned long                                : 6;
-+     unsigned long crtc_fr_end                    : 10;
-+     unsigned long                                : 4;
-+     unsigned long crtc_frame_en                  : 1;
-+     unsigned long crtc_frame_align               : 1;
-+     } crtc_frame_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_frame_t f;
-+} crtc_frame_u;
-+
-+typedef struct _crtc_frame_vpos_t {
-+     unsigned long crtc_fr_vpos                   : 10;
-+     unsigned long                                : 22;
-+     } crtc_frame_vpos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_frame_vpos_t f;
-+} crtc_frame_vpos_u;
-+
-+typedef struct _gpio_data_t {
-+     unsigned long gio_out                        : 16;
-+     unsigned long gio_in                         : 16;
-+     } gpio_data_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gpio_data_t f;
-+} gpio_data_u;
-+
-+typedef struct _gpio_cntl1_t {
-+     unsigned long gio_pd                         : 16;
-+     unsigned long gio_schmen                     : 16;
-+     } gpio_cntl1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gpio_cntl1_t f;
-+} gpio_cntl1_u;
-+
-+typedef struct _gpio_cntl2_t {
-+     unsigned long gio_oe                         : 16;
-+     unsigned long gio_srp                        : 1;
-+     unsigned long gio_srn                        : 1;
-+     unsigned long gio_sp                         : 4;
-+     unsigned long gio_sn                         : 4;
-+     unsigned long                                : 6;
-+     } gpio_cntl2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gpio_cntl2_t f;
-+} gpio_cntl2_u;
-+
-+typedef struct _lcdd_cntl1_t {
-+     unsigned long lcdd_pd                        : 18;
-+     unsigned long lcdd_srp                       : 1;
-+     unsigned long lcdd_srn                       : 1;
-+     unsigned long lcdd_sp                        : 4;
-+     unsigned long lcdd_sn                        : 4;
-+     unsigned long lcdd_align                     : 1;
-+     unsigned long                                : 3;
-+     } lcdd_cntl1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     lcdd_cntl1_t f;
-+} lcdd_cntl1_u;
-+
-+typedef struct _lcdd_cntl2_t {
-+     unsigned long lcdd_oe                        : 18;
-+     unsigned long                                : 14;
-+     } lcdd_cntl2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     lcdd_cntl2_t f;
-+} lcdd_cntl2_u;
-+
-+typedef struct _genlcd_cntl1_t {
-+     unsigned long dclk_oe                        : 1;
-+     unsigned long dclk_pd                        : 1;
-+     unsigned long dclk_srp                       : 1;
-+     unsigned long dclk_srn                       : 1;
-+     unsigned long dclk_sp                        : 4;
-+     unsigned long dclk_sn                        : 4;
-+     unsigned long ss_oe                          : 1;
-+     unsigned long ss_pd                          : 1;
-+     unsigned long ls_oe                          : 1;
-+     unsigned long ls_pd                          : 1;
-+     unsigned long gs_oe                          : 1;
-+     unsigned long gs_pd                          : 1;
-+     unsigned long goe_oe                         : 1;
-+     unsigned long goe_pd                         : 1;
-+     unsigned long rev_oe                         : 1;
-+     unsigned long rev_pd                         : 1;
-+     unsigned long frame_oe                       : 1;
-+     unsigned long frame_pd                       : 1;
-+     unsigned long                                : 8;
-+     } genlcd_cntl1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     genlcd_cntl1_t f;
-+} genlcd_cntl1_u;
-+
-+typedef struct _genlcd_cntl2_t {
-+     unsigned long gclk_oe                        : 1;
-+     unsigned long gclk_pd                        : 1;
-+     unsigned long gclk_srp                       : 1;
-+     unsigned long gclk_srn                       : 1;
-+     unsigned long gclk_sp                        : 4;
-+     unsigned long gclk_sn                        : 4;
-+     unsigned long genlcd_srp                     : 1;
-+     unsigned long genlcd_srn                     : 1;
-+     unsigned long genlcd_sp                      : 4;
-+     unsigned long genlcd_sn                      : 4;
-+     unsigned long                                : 10;
-+     } genlcd_cntl2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     genlcd_cntl2_t f;
-+} genlcd_cntl2_u;
-+
-+typedef struct _disp_debug_t {
-+     unsigned long disp_debug                     : 32;
-+     } disp_debug_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     disp_debug_t f;
-+} disp_debug_u;
-+
-+typedef struct _disp_db_buf_cntl_rd_t {
-+     unsigned long en_db_buf                      : 1;
-+     unsigned long update_db_buf_done             : 1;
-+     unsigned long db_buf_cntl                    : 6;
-+     unsigned long                                : 24;
-+     } disp_db_buf_cntl_rd_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     disp_db_buf_cntl_rd_t f;
-+} disp_db_buf_cntl_rd_u;
-+
-+typedef struct _disp_db_buf_cntl_wr_t {
-+     unsigned long en_db_buf                      : 1;
-+     unsigned long update_db_buf                  : 1;
-+     unsigned long db_buf_cntl                    : 6;
-+     unsigned long                                : 24;
-+     } disp_db_buf_cntl_wr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     disp_db_buf_cntl_wr_t f;
-+} disp_db_buf_cntl_wr_u;
-+
-+typedef struct _disp_crc_sig_t {
-+     unsigned long crc_sig_r                      : 6;
-+     unsigned long crc_sig_g                      : 6;
-+     unsigned long crc_sig_b                      : 6;
-+     unsigned long crc_cont_en                    : 1;
-+     unsigned long crc_en                         : 1;
-+     unsigned long crc_mask_en                    : 1;
-+     unsigned long crc_sig_cntl                   : 6;
-+     unsigned long                                : 5;
-+     } disp_crc_sig_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     disp_crc_sig_t f;
-+} disp_crc_sig_u;
-+
-+typedef struct _crtc_default_count_t {
-+     unsigned long crtc_hcount_def                : 10;
-+     unsigned long                                : 6;
-+     unsigned long crtc_vcount_def                : 10;
-+     unsigned long                                : 6;
-+     } crtc_default_count_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_default_count_t f;
-+} crtc_default_count_u;
-+
-+typedef struct _lcd_background_color_t {
-+     unsigned long lcd_bg_red                     : 8;
-+     unsigned long lcd_bg_green                   : 8;
-+     unsigned long lcd_bg_blue                    : 8;
-+     unsigned long                                : 8;
-+     } lcd_background_color_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     lcd_background_color_t f;
-+} lcd_background_color_u;
-+
-+typedef struct _crtc_ps2_t {
-+     unsigned long ps2_start                      : 10;
-+     unsigned long                                : 6;
-+     unsigned long ps2_end                        : 10;
-+     unsigned long                                : 4;
-+     unsigned long ps2_pol                        : 1;
-+     unsigned long ps2_en                         : 1;
-+     } crtc_ps2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_ps2_t f;
-+} crtc_ps2_u;
-+
-+typedef struct _crtc_ps2_vpos_t {
-+     unsigned long ps2_vpos_start                 : 10;
-+     unsigned long                                : 6;
-+     unsigned long ps2_vpos_end                   : 10;
-+     unsigned long                                : 6;
-+     } crtc_ps2_vpos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_ps2_vpos_t f;
-+} crtc_ps2_vpos_u;
-+
-+typedef struct _crtc_ps1_active_t {
-+     unsigned long ps1_h_start                    : 10;
-+     unsigned long                                : 6;
-+     unsigned long ps1_h_end                      : 10;
-+     unsigned long                                : 3;
-+     unsigned long ps1_pol                        : 1;
-+     unsigned long ps1_en                         : 1;
-+     unsigned long ps1_use_nactive                : 1;
-+     } crtc_ps1_active_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_ps1_active_t f;
-+} crtc_ps1_active_u;
-+
-+typedef struct _crtc_ps1_nactive_t {
-+     unsigned long ps1_h_start_na                 : 10;
-+     unsigned long                                : 6;
-+     unsigned long ps1_h_end_na                   : 10;
-+     unsigned long                                : 5;
-+     unsigned long ps1_en_na                      : 1;
-+     } crtc_ps1_nactive_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_ps1_nactive_t f;
-+} crtc_ps1_nactive_u;
-+
-+typedef struct _crtc_gclk_ext_t {
-+     unsigned long gclk_alter_start               : 10;
-+     unsigned long                                : 6;
-+     unsigned long gclk_alter_width               : 2;
-+     unsigned long gclk_en_alter                  : 1;
-+     unsigned long gclk_db_width                  : 2;
-+     unsigned long                                : 11;
-+     } crtc_gclk_ext_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_gclk_ext_t f;
-+} crtc_gclk_ext_u;
-+
-+typedef struct _crtc_alw_t {
-+     unsigned long alw_hstart                     : 10;
-+     unsigned long                                : 6;
-+     unsigned long alw_hend                       : 10;
-+     unsigned long                                : 4;
-+     unsigned long alw_delay                      : 1;
-+     unsigned long alw_en                         : 1;
-+     } crtc_alw_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_alw_t f;
-+} crtc_alw_u;
-+
-+typedef struct _crtc_alw_vpos_t {
-+     unsigned long alw_vstart                     : 10;
-+     unsigned long                                : 6;
-+     unsigned long alw_vend                       : 10;
-+     unsigned long                                : 6;
-+     } crtc_alw_vpos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_alw_vpos_t f;
-+} crtc_alw_vpos_u;
-+
-+typedef struct _crtc_psk_t {
-+     unsigned long psk_vstart                     : 10;
-+     unsigned long                                : 6;
-+     unsigned long psk_vend                       : 10;
-+     unsigned long                                : 4;
-+     unsigned long psk_pol                        : 1;
-+     unsigned long psk_en                         : 1;
-+     } crtc_psk_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_psk_t f;
-+} crtc_psk_u;
-+
-+typedef struct _crtc_psk_hpos_t {
-+     unsigned long psk_hstart                     : 10;
-+     unsigned long                                : 6;
-+     unsigned long psk_hend                       : 10;
-+     unsigned long                                : 6;
-+     } crtc_psk_hpos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_psk_hpos_t f;
-+} crtc_psk_hpos_u;
-+
-+typedef struct _crtc_cv4_start_t {
-+     unsigned long cv4_vstart                     : 10;
-+     unsigned long                                : 20;
-+     unsigned long cv4_pol                        : 1;
-+     unsigned long cv4_en                         : 1;
-+     } crtc_cv4_start_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_cv4_start_t f;
-+} crtc_cv4_start_u;
-+
-+typedef struct _crtc_cv4_end_t {
-+     unsigned long cv4_vend1                      : 10;
-+     unsigned long                                : 6;
-+     unsigned long cv4_vend2                      : 10;
-+     unsigned long                                : 6;
-+     } crtc_cv4_end_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_cv4_end_t f;
-+} crtc_cv4_end_u;
-+
-+typedef struct _crtc_cv4_hpos_t {
-+     unsigned long cv4_hstart                     : 10;
-+     unsigned long                                : 6;
-+     unsigned long cv4_hend                       : 10;
-+     unsigned long                                : 6;
-+     } crtc_cv4_hpos_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_cv4_hpos_t f;
-+} crtc_cv4_hpos_u;
-+
-+typedef struct _crtc_eck_t {
-+     unsigned long eck_freq1                      : 3;
-+     unsigned long eck_en                         : 1;
-+     unsigned long                                : 28;
-+     } crtc_eck_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     crtc_eck_t f;
-+} crtc_eck_u;
-+
-+typedef struct _refresh_cntl_t {
-+     unsigned long ref_frame                      : 3;
-+     unsigned long nref_frame                     : 5;
-+     unsigned long ref_cntl                       : 1;
-+     unsigned long stop_sm_nref                   : 1;
-+     unsigned long stop_req_nref                  : 1;
-+     unsigned long                                : 21;
-+     } refresh_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     refresh_cntl_t f;
-+} refresh_cntl_u;
-+
-+typedef struct _genlcd_cntl3_t {
-+     unsigned long ps1_oe                         : 1;
-+     unsigned long ps1_pd                         : 1;
-+     unsigned long ps2_oe                         : 1;
-+     unsigned long ps2_pd                         : 1;
-+     unsigned long rev2_oe                        : 1;
-+     unsigned long rev2_pd                        : 1;
-+     unsigned long awl_oe                         : 1;
-+     unsigned long awl_pd                         : 1;
-+     unsigned long dinv_oe                        : 1;
-+     unsigned long dinv_pd                        : 1;
-+     unsigned long psk_out                        : 1;
-+     unsigned long psd_out                        : 1;
-+     unsigned long eck_out                        : 1;
-+     unsigned long cv4_out                        : 1;
-+     unsigned long ps1_out                        : 1;
-+     unsigned long ps2_out                        : 1;
-+     unsigned long rev_out                        : 1;
-+     unsigned long rev2_out                       : 1;
-+     unsigned long                                : 14;
-+     } genlcd_cntl3_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     genlcd_cntl3_t f;
-+} genlcd_cntl3_u;
-+
-+typedef struct _gpio_data2_t {
-+     unsigned long gio2_out                       : 16;
-+     unsigned long gio2_in                        : 16;
-+     } gpio_data2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gpio_data2_t f;
-+} gpio_data2_u;
-+
-+typedef struct _gpio_cntl3_t {
-+     unsigned long gio2_pd                        : 16;
-+     unsigned long gio2_schmen                    : 16;
-+     } gpio_cntl3_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gpio_cntl3_t f;
-+} gpio_cntl3_u;
-+
-+typedef struct _gpio_cntl4_t {
-+     unsigned long gio2_oe                        : 16;
-+     unsigned long                                : 16;
-+     } gpio_cntl4_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gpio_cntl4_t f;
-+} gpio_cntl4_u;
-+
-+typedef struct _chip_strap_t {
-+     unsigned long config_strap                   : 8;
-+     unsigned long pkg_strap                      : 1;
-+     unsigned long                                : 23;
-+     } chip_strap_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     chip_strap_t f;
-+} chip_strap_u;
-+
-+typedef struct _disp_debug2_t {
-+     unsigned long disp_debug2                    : 32;
-+     } disp_debug2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     disp_debug2_t f;
-+} disp_debug2_u;
-+
-+typedef struct _debug_bus_cntl_t {
-+     unsigned long debug_testmux                  : 4;
-+     unsigned long debug_testsel                  : 4;
-+     unsigned long debug_gioa_sel                 : 2;
-+     unsigned long debug_giob_sel                 : 2;
-+     unsigned long debug_clk_sel                  : 1;
-+     unsigned long debug_clk_inv                  : 1;
-+     unsigned long                                : 2;
-+     unsigned long debug_bus                      : 16;
-+     } debug_bus_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug_bus_cntl_t f;
-+} debug_bus_cntl_u;
-+
-+typedef struct _gamma_value1_t {
-+     unsigned long gamma1                         : 8;
-+     unsigned long gamma2                         : 8;
-+     unsigned long gamma3                         : 8;
-+     unsigned long gamma4                         : 8;
-+     } gamma_value1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gamma_value1_t f;
-+} gamma_value1_u;
-+
-+typedef struct _gamma_value2_t {
-+     unsigned long gamma5                         : 8;
-+     unsigned long gamma6                         : 8;
-+     unsigned long gamma7                         : 8;
-+     unsigned long gamma8                         : 8;
-+     } gamma_value2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gamma_value2_t f;
-+} gamma_value2_u;
-+
-+typedef struct _gamma_slope_t {
-+     unsigned long slope1                         : 3;
-+     unsigned long slope2                         : 3;
-+     unsigned long slope3                         : 3;
-+     unsigned long slope4                         : 3;
-+     unsigned long slope5                         : 3;
-+     unsigned long slope6                         : 3;
-+     unsigned long slope7                         : 3;
-+     unsigned long slope8                         : 3;
-+     unsigned long                                : 8;
-+     } gamma_slope_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gamma_slope_t f;
-+} gamma_slope_u;
-+
-+typedef struct _gen_status_t {
-+     unsigned long status                         : 16;
-+     unsigned long                                : 16;
-+     } gen_status_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     gen_status_t f;
-+} gen_status_u;
-+
-+typedef struct _hw_int_t {
-+     unsigned long hwint1_pos                     : 5;
-+     unsigned long hwint2_pos                     : 5;
-+     unsigned long hwint1_pol                     : 1;
-+     unsigned long hwint2_pol                     : 1;
-+     unsigned long hwint1_en_db                   : 1;
-+     unsigned long hwint2_en_db                   : 1;
-+     unsigned long                                : 18;
-+     } hw_int_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     hw_int_t f;
-+} hw_int_u;
-+
-+typedef struct _dst_offset_t {
-+     unsigned long dst_offset                     : 24;
-+     unsigned long                                : 8;
-+     } dst_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_offset_t f;
-+} dst_offset_u;
-+
-+typedef struct _dst_pitch_t {
-+     unsigned long dst_pitch                      : 14;
-+     unsigned long mc_dst_pitch_mul               : 2;
-+     unsigned long                                : 16;
-+     } dst_pitch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_pitch_t f;
-+} dst_pitch_u;
-+
-+typedef struct _dst_pitch_offset_t {
-+     unsigned long dst_offset                     : 20;
-+     unsigned long dst_pitch                      : 10;
-+     unsigned long mc_dst_pitch_mul               : 2;
-+     } dst_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_pitch_offset_t f;
-+} dst_pitch_offset_u;
-+
-+typedef struct _dst_x_t {
-+     unsigned long dst_x                          : 14;
-+     unsigned long                                : 18;
-+     } dst_x_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_x_t f;
-+} dst_x_u;
-+
-+typedef struct _dst_y_t {
-+     unsigned long dst_y                          : 14;
-+     unsigned long                                : 18;
-+     } dst_y_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_y_t f;
-+} dst_y_u;
-+
-+typedef struct _dst_x_y_t {
-+     unsigned long dst_y                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_x                          : 14;
-+     unsigned long                                : 2;
-+     } dst_x_y_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_x_y_t f;
-+} dst_x_y_u;
-+
-+typedef struct _dst_y_x_t {
-+     unsigned long dst_x                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_y                          : 14;
-+     unsigned long                                : 2;
-+     } dst_y_x_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_y_x_t f;
-+} dst_y_x_u;
-+
-+typedef struct _dst_width_t {
-+     unsigned long dst_width_b0                   : 8;
-+     unsigned long dst_width_b1                   : 6;
-+     unsigned long                                : 18;
-+     } dst_width_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_width_t f;
-+} dst_width_u;
-+
-+typedef struct _dst_height_t {
-+     unsigned long dst_height                     : 14;
-+     unsigned long                                : 18;
-+     } dst_height_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_height_t f;
-+} dst_height_u;
-+
-+typedef struct _dst_width_height_t {
-+     unsigned long dst_height                     : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_width_b0                   : 8;
-+     unsigned long dst_width_b1                   : 6;
-+     unsigned long                                : 2;
-+     } dst_width_height_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_width_height_t f;
-+} dst_width_height_u;
-+
-+typedef struct _dst_height_width_t {
-+     unsigned long dst_width_b0                   : 8;
-+     unsigned long dst_width_b1                   : 6;
-+     unsigned long                                : 2;
-+     unsigned long dst_height                     : 14;
-+     unsigned long                                : 2;
-+     } dst_height_width_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_height_width_t f;
-+} dst_height_width_u;
-+
-+typedef struct _dst_height_width_8_t {
-+     unsigned long                                : 16;
-+     unsigned long dst_width_b0                   : 8;
-+     unsigned long dst_height                     : 8;
-+     } dst_height_width_8_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_height_width_8_t f;
-+} dst_height_width_8_u;
-+
-+typedef struct _dst_height_y_t {
-+     unsigned long dst_y                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_height                     : 14;
-+     unsigned long                                : 2;
-+     } dst_height_y_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_height_y_t f;
-+} dst_height_y_u;
-+
-+typedef struct _dst_width_x_t {
-+     unsigned long dst_x                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_width_b0                   : 8;
-+     unsigned long dst_width_b1                   : 6;
-+     unsigned long                                : 2;
-+     } dst_width_x_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_width_x_t f;
-+} dst_width_x_u;
-+
-+typedef struct _dst_width_x_incy_t {
-+     unsigned long dst_x                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_width_b0                   : 8;
-+     unsigned long dst_width_b1                   : 6;
-+     unsigned long                                : 2;
-+     } dst_width_x_incy_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_width_x_incy_t f;
-+} dst_width_x_incy_u;
-+
-+typedef struct _dst_line_start_t {
-+     unsigned long dst_start_x                    : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_start_y                    : 14;
-+     unsigned long                                : 2;
-+     } dst_line_start_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_line_start_t f;
-+} dst_line_start_u;
-+
-+typedef struct _dst_line_end_t {
-+     unsigned long dst_end_x                      : 14;
-+     unsigned long                                : 2;
-+     unsigned long dst_end_y_b0                   : 8;
-+     unsigned long dst_end_y_b1                   : 6;
-+     unsigned long                                : 2;
-+     } dst_line_end_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dst_line_end_t f;
-+} dst_line_end_u;
-+
-+typedef struct _brush_offset_t {
-+     unsigned long brush_offset                   : 24;
-+     unsigned long                                : 8;
-+     } brush_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     brush_offset_t f;
-+} brush_offset_u;
-+
-+typedef struct _brush_y_x_t {
-+     unsigned long brush_x                        : 5;
-+     unsigned long                                : 3;
-+     unsigned long brush_y                        : 3;
-+     unsigned long                                : 21;
-+     } brush_y_x_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     brush_y_x_t f;
-+} brush_y_x_u;
-+
-+typedef struct _dp_brush_frgd_clr_t {
-+     unsigned long dp_brush_frgd_clr              : 32;
-+     } dp_brush_frgd_clr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_brush_frgd_clr_t f;
-+} dp_brush_frgd_clr_u;
-+
-+typedef struct _dp_brush_bkgd_clr_t {
-+     unsigned long dp_brush_bkgd_clr              : 32;
-+     } dp_brush_bkgd_clr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_brush_bkgd_clr_t f;
-+} dp_brush_bkgd_clr_u;
-+
-+typedef struct _src2_offset_t {
-+     unsigned long src2_offset                    : 24;
-+     unsigned long                                : 8;
-+     } src2_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_offset_t f;
-+} src2_offset_u;
-+
-+typedef struct _src2_pitch_t {
-+     unsigned long src2_pitch                     : 14;
-+     unsigned long src2_pitch_mul                 : 2;
-+     unsigned long                                : 16;
-+     } src2_pitch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_pitch_t f;
-+} src2_pitch_u;
-+
-+typedef struct _src2_pitch_offset_t {
-+     unsigned long src2_offset                    : 20;
-+     unsigned long                                : 2;
-+     unsigned long src2_pitch                     : 8;
-+     unsigned long src2_pitch_mul                 : 2;
-+     } src2_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_pitch_offset_t f;
-+} src2_pitch_offset_u;
-+
-+typedef struct _src2_x_t {
-+     unsigned long src_x                          : 14;
-+     unsigned long                                : 18;
-+     } src2_x_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_x_t f;
-+} src2_x_u;
-+
-+typedef struct _src2_y_t {
-+     unsigned long src_y                          : 14;
-+     unsigned long                                : 18;
-+     } src2_y_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_y_t f;
-+} src2_y_u;
-+
-+typedef struct _src2_x_y_t {
-+     unsigned long src_y                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long src_x                          : 14;
-+     unsigned long                                : 2;
-+     } src2_x_y_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_x_y_t f;
-+} src2_x_y_u;
-+
-+typedef struct _src2_width_t {
-+     unsigned long src2_width                     : 14;
-+     unsigned long                                : 18;
-+     } src2_width_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_width_t f;
-+} src2_width_u;
-+
-+typedef struct _src2_height_t {
-+     unsigned long src2_height                    : 14;
-+     unsigned long                                : 18;
-+     } src2_height_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_height_t f;
-+} src2_height_u;
-+
-+typedef struct _src2_inc_t {
-+     unsigned long src2_xinc                      : 6;
-+     unsigned long                                : 2;
-+     unsigned long src2_yinc                      : 6;
-+     unsigned long                                : 18;
-+     } src2_inc_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src2_inc_t f;
-+} src2_inc_u;
-+
-+typedef struct _src_offset_t {
-+     unsigned long src_offset                     : 24;
-+     unsigned long                                : 8;
-+     } src_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_offset_t f;
-+} src_offset_u;
-+
-+typedef struct _src_pitch_t {
-+     unsigned long src_pitch                      : 14;
-+     unsigned long src_pitch_mul                  : 2;
-+     unsigned long                                : 16;
-+     } src_pitch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_pitch_t f;
-+} src_pitch_u;
-+
-+typedef struct _src_pitch_offset_t {
-+     unsigned long src_offset                     : 20;
-+     unsigned long src_pitch                      : 10;
-+     unsigned long src_pitch_mul                  : 2;
-+     } src_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_pitch_offset_t f;
-+} src_pitch_offset_u;
-+
-+typedef struct _src_x_t {
-+     unsigned long src_x                          : 14;
-+     unsigned long                                : 18;
-+     } src_x_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_x_t f;
-+} src_x_u;
-+
-+typedef struct _src_y_t {
-+     unsigned long src_y                          : 14;
-+     unsigned long                                : 18;
-+     } src_y_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_y_t f;
-+} src_y_u;
-+
-+typedef struct _src_x_y_t {
-+     unsigned long src_y                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long src_x                          : 14;
-+     unsigned long                                : 2;
-+     } src_x_y_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_x_y_t f;
-+} src_x_y_u;
-+
-+typedef struct _src_y_x_t {
-+     unsigned long src_x                          : 14;
-+     unsigned long                                : 2;
-+     unsigned long src_y                          : 14;
-+     unsigned long                                : 2;
-+     } src_y_x_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_y_x_t f;
-+} src_y_x_u;
-+
-+typedef struct _src_width_t {
-+     unsigned long src_width                      : 14;
-+     unsigned long                                : 18;
-+     } src_width_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_width_t f;
-+} src_width_u;
-+
-+typedef struct _src_height_t {
-+     unsigned long src_height                     : 14;
-+     unsigned long                                : 18;
-+     } src_height_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_height_t f;
-+} src_height_u;
-+
-+typedef struct _src_inc_t {
-+     unsigned long src_xinc                       : 6;
-+     unsigned long                                : 2;
-+     unsigned long src_yinc                       : 6;
-+     unsigned long                                : 18;
-+     } src_inc_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_inc_t f;
-+} src_inc_u;
-+
-+typedef struct _host_data0_t {
-+     unsigned long host_data                      : 32;
-+     } host_data0_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data0_t f;
-+} host_data0_u;
-+
-+typedef struct _host_data1_t {
-+     unsigned long host_data                      : 32;
-+     } host_data1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data1_t f;
-+} host_data1_u;
-+
-+typedef struct _host_data2_t {
-+     unsigned long host_data                      : 32;
-+     } host_data2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data2_t f;
-+} host_data2_u;
-+
-+typedef struct _host_data3_t {
-+     unsigned long host_data                      : 32;
-+     } host_data3_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data3_t f;
-+} host_data3_u;
-+
-+typedef struct _host_data4_t {
-+     unsigned long host_data                      : 32;
-+     } host_data4_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data4_t f;
-+} host_data4_u;
-+
-+typedef struct _host_data5_t {
-+     unsigned long host_data                      : 32;
-+     } host_data5_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data5_t f;
-+} host_data5_u;
-+
-+typedef struct _host_data6_t {
-+     unsigned long host_data                      : 32;
-+     } host_data6_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data6_t f;
-+} host_data6_u;
-+
-+typedef struct _host_data7_t {
-+     unsigned long host_data                      : 32;
-+     } host_data7_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data7_t f;
-+} host_data7_u;
-+
-+typedef struct _host_data_last_t {
-+     unsigned long host_data_last                 : 32;
-+     } host_data_last_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     host_data_last_t f;
-+} host_data_last_u;
-+
-+typedef struct _dp_src_frgd_clr_t {
-+     unsigned long dp_src_frgd_clr                : 32;
-+     } dp_src_frgd_clr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_src_frgd_clr_t f;
-+} dp_src_frgd_clr_u;
-+
-+typedef struct _dp_src_bkgd_clr_t {
-+     unsigned long dp_src_bkgd_clr                : 32;
-+     } dp_src_bkgd_clr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_src_bkgd_clr_t f;
-+} dp_src_bkgd_clr_u;
-+
-+typedef struct _sc_left_t {
-+     unsigned long sc_left                        : 14;
-+     unsigned long                                : 18;
-+     } sc_left_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     sc_left_t f;
-+} sc_left_u;
-+
-+typedef struct _sc_right_t {
-+     unsigned long sc_right                       : 14;
-+     unsigned long                                : 18;
-+     } sc_right_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     sc_right_t f;
-+} sc_right_u;
-+
-+typedef struct _sc_top_t {
-+     unsigned long sc_top                         : 14;
-+     unsigned long                                : 18;
-+     } sc_top_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     sc_top_t f;
-+} sc_top_u;
-+
-+typedef struct _sc_bottom_t {
-+     unsigned long sc_bottom                      : 14;
-+     unsigned long                                : 18;
-+     } sc_bottom_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     sc_bottom_t f;
-+} sc_bottom_u;
-+
-+typedef struct _src_sc_right_t {
-+     unsigned long sc_right                       : 14;
-+     unsigned long                                : 18;
-+     } src_sc_right_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_sc_right_t f;
-+} src_sc_right_u;
-+
-+typedef struct _src_sc_bottom_t {
-+     unsigned long sc_bottom                      : 14;
-+     unsigned long                                : 18;
-+     } src_sc_bottom_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_sc_bottom_t f;
-+} src_sc_bottom_u;
-+
-+typedef struct _dp_cntl_t {
-+     unsigned long dst_x_dir                      : 1;
-+     unsigned long dst_y_dir                      : 1;
-+     unsigned long src_x_dir                      : 1;
-+     unsigned long src_y_dir                      : 1;
-+     unsigned long dst_major_x                    : 1;
-+     unsigned long src_major_x                    : 1;
-+     unsigned long                                : 26;
-+     } dp_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_cntl_t f;
-+} dp_cntl_u;
-+
-+typedef struct _dp_cntl_dst_dir_t {
-+     unsigned long                                : 15;
-+     unsigned long dst_y_dir                      : 1;
-+     unsigned long                                : 15;
-+     unsigned long dst_x_dir                      : 1;
-+     } dp_cntl_dst_dir_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_cntl_dst_dir_t f;
-+} dp_cntl_dst_dir_u;
-+
-+typedef struct _dp_datatype_t {
-+     unsigned long dp_dst_datatype                : 4;
-+     unsigned long                                : 4;
-+     unsigned long dp_brush_datatype              : 4;
-+     unsigned long dp_src2_type                   : 1;
-+     unsigned long dp_src2_datatype               : 3;
-+     unsigned long dp_src_datatype                : 3;
-+     unsigned long                                : 11;
-+     unsigned long dp_byte_pix_order              : 1;
-+     unsigned long                                : 1;
-+     } dp_datatype_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_datatype_t f;
-+} dp_datatype_u;
-+
-+typedef struct _dp_mix_t {
-+     unsigned long                                : 8;
-+     unsigned long dp_src_source                  : 3;
-+     unsigned long dp_src2_source                 : 3;
-+     unsigned long                                : 2;
-+     unsigned long dp_rop3                        : 8;
-+     unsigned long dp_op                          : 1;
-+     unsigned long                                : 7;
-+     } dp_mix_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_mix_t f;
-+} dp_mix_u;
-+
-+typedef struct _dp_write_msk_t {
-+     unsigned long dp_write_msk                   : 32;
-+     } dp_write_msk_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_write_msk_t f;
-+} dp_write_msk_u;
-+
-+typedef struct _clr_cmp_clr_src_t {
-+     unsigned long clr_cmp_clr_src                : 32;
-+     } clr_cmp_clr_src_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     clr_cmp_clr_src_t f;
-+} clr_cmp_clr_src_u;
-+
-+typedef struct _clr_cmp_clr_dst_t {
-+     unsigned long clr_cmp_clr_dst                : 32;
-+     } clr_cmp_clr_dst_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     clr_cmp_clr_dst_t f;
-+} clr_cmp_clr_dst_u;
-+
-+typedef struct _clr_cmp_cntl_t {
-+     unsigned long clr_cmp_fcn_src                : 3;
-+     unsigned long                                : 5;
-+     unsigned long clr_cmp_fcn_dst                : 3;
-+     unsigned long                                : 13;
-+     unsigned long clr_cmp_src                    : 2;
-+     unsigned long                                : 6;
-+     } clr_cmp_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     clr_cmp_cntl_t f;
-+} clr_cmp_cntl_u;
-+
-+typedef struct _clr_cmp_msk_t {
-+     unsigned long clr_cmp_msk                    : 32;
-+     } clr_cmp_msk_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     clr_cmp_msk_t f;
-+} clr_cmp_msk_u;
-+
-+typedef struct _default_pitch_offset_t {
-+     unsigned long default_offset                 : 20;
-+     unsigned long default_pitch                  : 10;
-+     unsigned long                                : 2;
-+     } default_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     default_pitch_offset_t f;
-+} default_pitch_offset_u;
-+
-+typedef struct _default_sc_bottom_right_t {
-+     unsigned long default_sc_right               : 14;
-+     unsigned long                                : 2;
-+     unsigned long default_sc_bottom              : 14;
-+     unsigned long                                : 2;
-+     } default_sc_bottom_right_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     default_sc_bottom_right_t f;
-+} default_sc_bottom_right_u;
-+
-+typedef struct _default2_sc_bottom_right_t {
-+     unsigned long default_sc_right               : 14;
-+     unsigned long                                : 2;
-+     unsigned long default_sc_bottom              : 14;
-+     unsigned long                                : 2;
-+     } default2_sc_bottom_right_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     default2_sc_bottom_right_t f;
-+} default2_sc_bottom_right_u;
-+
-+typedef struct _ref1_pitch_offset_t {
-+     unsigned long offset                         : 20;
-+     unsigned long                                : 2;
-+     unsigned long pitch                          : 8;
-+     unsigned long                                : 2;
-+     } ref1_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     ref1_pitch_offset_t f;
-+} ref1_pitch_offset_u;
-+
-+typedef struct _ref2_pitch_offset_t {
-+     unsigned long offset                         : 20;
-+     unsigned long                                : 2;
-+     unsigned long pitch                          : 8;
-+     unsigned long                                : 2;
-+     } ref2_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     ref2_pitch_offset_t f;
-+} ref2_pitch_offset_u;
-+
-+typedef struct _ref3_pitch_offset_t {
-+     unsigned long offset                         : 20;
-+     unsigned long                                : 2;
-+     unsigned long pitch                          : 8;
-+     unsigned long                                : 2;
-+     } ref3_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     ref3_pitch_offset_t f;
-+} ref3_pitch_offset_u;
-+
-+typedef struct _ref4_pitch_offset_t {
-+     unsigned long offset                         : 20;
-+     unsigned long                                : 2;
-+     unsigned long pitch                          : 8;
-+     unsigned long                                : 2;
-+     } ref4_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     ref4_pitch_offset_t f;
-+} ref4_pitch_offset_u;
-+
-+typedef struct _ref5_pitch_offset_t {
-+     unsigned long offset                         : 20;
-+     unsigned long                                : 2;
-+     unsigned long pitch                          : 8;
-+     unsigned long                                : 2;
-+     } ref5_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     ref5_pitch_offset_t f;
-+} ref5_pitch_offset_u;
-+
-+typedef struct _ref6_pitch_offset_t {
-+     unsigned long offset                         : 20;
-+     unsigned long                                : 2;
-+     unsigned long pitch                          : 8;
-+     unsigned long                                : 2;
-+     } ref6_pitch_offset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     ref6_pitch_offset_t f;
-+} ref6_pitch_offset_u;
-+
-+typedef struct _dp_gui_master_cntl_t {
-+     unsigned long gmc_src_pitch_offset_cntl      : 1;
-+     unsigned long gmc_dst_pitch_offset_cntl      : 1;
-+     unsigned long gmc_src_clipping               : 1;
-+     unsigned long gmc_dst_clipping               : 1;
-+     unsigned long gmc_brush_datatype             : 4;
-+     unsigned long gmc_dst_datatype               : 4;
-+     unsigned long gmc_src_datatype               : 3;
-+     unsigned long gmc_byte_pix_order             : 1;
-+     unsigned long gmc_default_sel                : 1;
-+     unsigned long gmc_rop3                       : 8;
-+     unsigned long gmc_dp_src_source              : 3;
-+     unsigned long gmc_clr_cmp_fcn_dis            : 1;
-+     unsigned long                                : 1;
-+     unsigned long gmc_wr_msk_dis                 : 1;
-+     unsigned long gmc_dp_op                      : 1;
-+     } dp_gui_master_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     dp_gui_master_cntl_t f;
-+} dp_gui_master_cntl_u;
-+
-+typedef struct _sc_top_left_t {
-+     unsigned long sc_left                        : 14;
-+     unsigned long                                : 2;
-+     unsigned long sc_top                         : 14;
-+     unsigned long                                : 2;
-+     } sc_top_left_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     sc_top_left_t f;
-+} sc_top_left_u;
-+
-+typedef struct _sc_bottom_right_t {
-+     unsigned long sc_right                       : 14;
-+     unsigned long                                : 2;
-+     unsigned long sc_bottom                      : 14;
-+     unsigned long                                : 2;
-+     } sc_bottom_right_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     sc_bottom_right_t f;
-+} sc_bottom_right_u;
-+
-+typedef struct _src_sc_bottom_right_t {
-+     unsigned long sc_right                       : 14;
-+     unsigned long                                : 2;
-+     unsigned long sc_bottom                      : 14;
-+     unsigned long                                : 2;
-+     } src_sc_bottom_right_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     src_sc_bottom_right_t f;
-+} src_sc_bottom_right_u;
-+
-+typedef struct _global_alpha_t {
-+     unsigned long alpha_r                        : 8;
-+     unsigned long alpha_g                        : 8;
-+     unsigned long alpha_b                        : 8;
-+     unsigned long alpha_a                        : 8;
-+     } global_alpha_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     global_alpha_t f;
-+} global_alpha_u;
-+
-+typedef struct _filter_coef_t {
-+     unsigned long c_4                            : 4;
-+     unsigned long c_3                            : 4;
-+     unsigned long c_2                            : 4;
-+     unsigned long c_1                            : 4;
-+     unsigned long c1                             : 4;
-+     unsigned long c2                             : 4;
-+     unsigned long c3                             : 4;
-+     unsigned long c4                             : 4;
-+     } filter_coef_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     filter_coef_t f;
-+} filter_coef_u;
-+
-+typedef struct _mvc_cntl_start_t {
-+     unsigned long mc_cntl_src_1_index            : 4;
-+     unsigned long mc_cntl_dst_offset             : 20;
-+     unsigned long mc_dst_pitch_mul               : 2;
-+     unsigned long mc_cntl_src_2_index            : 3;
-+     unsigned long mc_cntl_width_height_sel       : 3;
-+     } mvc_cntl_start_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mvc_cntl_start_t f;
-+} mvc_cntl_start_u;
-+
-+typedef struct _e2_arithmetic_cntl_t {
-+     unsigned long opcode                         : 5;
-+     unsigned long shiftright                     : 4;
-+     unsigned long clamp                          : 1;
-+     unsigned long rounding                       : 2;
-+     unsigned long filter_n                       : 3;
-+     unsigned long                                : 1;
-+     unsigned long srcblend_inv                   : 1;
-+     unsigned long srcblend                       : 4;
-+     unsigned long                                : 3;
-+     unsigned long dstblend_inv                   : 1;
-+     unsigned long dstblend                       : 4;
-+     unsigned long dst_signed                     : 1;
-+     unsigned long autoinc                        : 1;
-+     unsigned long                                : 1;
-+     } e2_arithmetic_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     e2_arithmetic_cntl_t f;
-+} e2_arithmetic_cntl_u;
-+
-+typedef struct _debug0_t {
-+     unsigned long debug0_r                       : 8;
-+     unsigned long                                : 8;
-+     unsigned long debug0_rw                      : 8;
-+     unsigned long                                : 8;
-+     } debug0_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug0_t f;
-+} debug0_u;
-+
-+typedef struct _debug1_t {
-+     unsigned long debug1_r                       : 8;
-+     unsigned long                                : 8;
-+     unsigned long debug1_rw                      : 8;
-+     unsigned long                                : 8;
-+     } debug1_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug1_t f;
-+} debug1_u;
-+
-+typedef struct _debug2_t {
-+     unsigned long debug2_r                       : 8;
-+     unsigned long                                : 8;
-+     unsigned long debug2_rw                      : 8;
-+     unsigned long                                : 8;
-+     } debug2_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug2_t f;
-+} debug2_u;
-+
-+typedef struct _debug3_t {
-+     unsigned long                                : 32;
-+     } debug3_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug3_t f;
-+} debug3_u;
-+
-+typedef struct _debug4_t {
-+     unsigned long                                : 32;
-+     } debug4_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug4_t f;
-+} debug4_u;
-+
-+typedef struct _debug5_t {
-+     unsigned long                                : 32;
-+     } debug5_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug5_t f;
-+} debug5_u;
-+
-+typedef struct _debug6_t {
-+     unsigned long                                : 32;
-+     } debug6_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug6_t f;
-+} debug6_u;
-+
-+typedef struct _debug7_t {
-+     unsigned long                                : 32;
-+     } debug7_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug7_t f;
-+} debug7_u;
-+
-+typedef struct _debug8_t {
-+     unsigned long                                : 32;
-+     } debug8_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug8_t f;
-+} debug8_u;
-+
-+typedef struct _debug9_t {
-+     unsigned long                                : 32;
-+     } debug9_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug9_t f;
-+} debug9_u;
-+
-+typedef struct _debug10_t {
-+     unsigned long                                : 32;
-+     } debug10_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug10_t f;
-+} debug10_u;
-+
-+typedef struct _debug11_t {
-+     unsigned long                                : 32;
-+     } debug11_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug11_t f;
-+} debug11_u;
-+
-+typedef struct _debug12_t {
-+     unsigned long                                : 32;
-+     } debug12_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug12_t f;
-+} debug12_u;
-+
-+typedef struct _debug13_t {
-+     unsigned long                                : 32;
-+     } debug13_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug13_t f;
-+} debug13_u;
-+
-+typedef struct _debug14_t {
-+     unsigned long                                : 32;
-+     } debug14_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug14_t f;
-+} debug14_u;
-+
-+typedef struct _debug15_t {
-+     unsigned long                                : 32;
-+     } debug15_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     debug15_t f;
-+} debug15_u;
-+
-+typedef struct _eng_cntl_t {
-+     unsigned long erc_reg_rd_ws                  : 1;
-+     unsigned long erc_reg_wr_ws                  : 1;
-+     unsigned long erc_idle_reg_wr                : 1;
-+     unsigned long dis_engine_triggers            : 1;
-+     unsigned long dis_rop_src_uses_dst_w_h       : 1;
-+     unsigned long dis_src_uses_dst_dirmaj        : 1;
-+     unsigned long                                : 6;
-+     unsigned long force_3dclk_when_2dclk         : 1;
-+     unsigned long                                : 19;
-+     } eng_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     eng_cntl_t f;
-+} eng_cntl_u;
-+
-+typedef struct _eng_perf_cnt_t {
-+     unsigned long perf_cnt                       : 20;
-+     unsigned long perf_sel                       : 4;
-+     unsigned long perf_en                        : 1;
-+     unsigned long                                : 3;
-+     unsigned long perf_clr                       : 1;
-+     unsigned long                                : 3;
-+     } eng_perf_cnt_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     eng_perf_cnt_t f;
-+} eng_perf_cnt_u;
-+
-+typedef struct _idct_runs_t {
-+     unsigned long idct_runs_3                    : 8;
-+     unsigned long idct_runs_2                    : 8;
-+     unsigned long idct_runs_1                    : 8;
-+     unsigned long idct_runs_0                    : 8;
-+     } idct_runs_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     idct_runs_t f;
-+} idct_runs_u;
-+
-+typedef struct _idct_levels_t {
-+     unsigned long idct_level_hi                  : 16;
-+     unsigned long idct_level_lo                  : 16;
-+     } idct_levels_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     idct_levels_t f;
-+} idct_levels_u;
-+
-+typedef struct _idct_control_t {
-+     unsigned long idct_ctl_luma_rd_format        : 2;
-+     unsigned long idct_ctl_chroma_rd_format      : 2;
-+     unsigned long idct_ctl_scan_pattern          : 1;
-+     unsigned long idct_ctl_intra                 : 1;
-+     unsigned long idct_ctl_flush                 : 1;
-+     unsigned long idct_ctl_passthru              : 1;
-+     unsigned long idct_ctl_sw_reset              : 1;
-+     unsigned long idct_ctl_constreq              : 1;
-+     unsigned long idct_ctl_scramble              : 1;
-+     unsigned long idct_ctl_alt_scan              : 1;
-+     unsigned long                                : 20;
-+     } idct_control_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     idct_control_t f;
-+} idct_control_u;
-+
-+typedef struct _idct_auth_control_t {
-+     unsigned long control_bits                   : 32;
-+     } idct_auth_control_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     idct_auth_control_t f;
-+} idct_auth_control_u;
-+
-+typedef struct _idct_auth_t {
-+     unsigned long auth                           : 32;
-+     } idct_auth_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     idct_auth_t f;
-+} idct_auth_u;
-+
-+typedef struct _mem_cntl_t {
-+     unsigned long                                : 1;
-+     unsigned long en_mem_ch1                     : 1;
-+     unsigned long en_mem_ch2                     : 1;
-+     unsigned long int_mem_mapping                : 1;
-+     unsigned long                                : 28;
-+     } mem_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mem_cntl_t f;
-+} mem_cntl_u;
-+
-+typedef struct _mem_arb_t {
-+     unsigned long disp_time_slot                 : 4;
-+     unsigned long disp_timer                     : 4;
-+     unsigned long arb_option                     : 1;
-+     unsigned long                                : 23;
-+     } mem_arb_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mem_arb_t f;
-+} mem_arb_u;
-+
-+typedef struct _mc_fb_location_t {
-+     unsigned long mc_fb_start                    : 16;
-+     unsigned long mc_fb_top                      : 16;
-+     } mc_fb_location_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mc_fb_location_t f;
-+} mc_fb_location_u;
-+
-+typedef struct _mem_ext_cntl_t {
-+     unsigned long mem_ext_enable                 : 1;
-+     unsigned long mem_ap_enable                  : 1;
-+     unsigned long mem_addr_mapping               : 2;
-+     unsigned long mem_wdoe_cntl                  : 2;
-+     unsigned long mem_wdoe_extend                : 1;
-+     unsigned long                                : 1;
-+     unsigned long mem_page_timer                 : 8;
-+     unsigned long mem_dynamic_cke                : 1;
-+     unsigned long mem_sdram_tri_en               : 1;
-+     unsigned long mem_self_refresh_en            : 1;
-+     unsigned long mem_power_down                 : 1;
-+     unsigned long mem_hw_power_down_en           : 1;
-+     unsigned long mem_power_down_stat            : 1;
-+     unsigned long                                : 3;
-+     unsigned long mem_pd_mck                     : 1;
-+     unsigned long mem_pd_ma                      : 1;
-+     unsigned long mem_pd_mdq                     : 1;
-+     unsigned long mem_tristate_mck               : 1;
-+     unsigned long mem_tristate_ma                : 1;
-+     unsigned long mem_tristate_mcke              : 1;
-+     unsigned long mem_invert_mck                 : 1;
-+     } mem_ext_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mem_ext_cntl_t f;
-+} mem_ext_cntl_u;
-+
-+typedef struct _mc_ext_mem_location_t {
-+     unsigned long mc_ext_mem_start               : 16;
-+     unsigned long mc_ext_mem_top                 : 16;
-+     } mc_ext_mem_location_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mc_ext_mem_location_t f;
-+} mc_ext_mem_location_u;
-+
-+typedef struct _mem_ext_timing_cntl_t {
-+     unsigned long mem_trp                        : 2;
-+     unsigned long mem_trcd                       : 2;
-+     unsigned long mem_tras                       : 3;
-+     unsigned long                                : 1;
-+     unsigned long mem_trrd                       : 2;
-+     unsigned long mem_tr2w                       : 2;
-+     unsigned long mem_twr                        : 2;
-+     unsigned long                                : 4;
-+     unsigned long mem_twr_mode                   : 1;
-+     unsigned long                                : 1;
-+     unsigned long mem_refresh_dis                : 1;
-+     unsigned long                                : 3;
-+     unsigned long mem_refresh_rate               : 8;
-+     } mem_ext_timing_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mem_ext_timing_cntl_t f;
-+} mem_ext_timing_cntl_u;
-+
-+typedef struct _mem_sdram_mode_reg_t {
-+     unsigned long mem_mode_reg                   : 14;
-+     unsigned long                                : 2;
-+     unsigned long mem_read_latency               : 2;
-+     unsigned long mem_schmen_latency             : 2;
-+     unsigned long mem_cas_latency                : 2;
-+     unsigned long mem_schmen_extend              : 1;
-+     unsigned long                                : 8;
-+     unsigned long mem_sdram_reset                : 1;
-+     } mem_sdram_mode_reg_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mem_sdram_mode_reg_t f;
-+} mem_sdram_mode_reg_u;
-+
-+typedef struct _mem_io_cntl_t {
-+     unsigned long mem_sn_mck                     : 4;
-+     unsigned long mem_sn_ma                      : 4;
-+     unsigned long mem_sn_mdq                     : 4;
-+     unsigned long mem_srn_mck                    : 1;
-+     unsigned long mem_srn_ma                     : 1;
-+     unsigned long mem_srn_mdq                    : 1;
-+     unsigned long                                : 1;
-+     unsigned long mem_sp_mck                     : 4;
-+     unsigned long mem_sp_ma                      : 4;
-+     unsigned long mem_sp_mdq                     : 4;
-+     unsigned long mem_srp_mck                    : 1;
-+     unsigned long mem_srp_ma                     : 1;
-+     unsigned long mem_srp_mdq                    : 1;
-+     unsigned long                                : 1;
-+     } mem_io_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mem_io_cntl_t f;
-+} mem_io_cntl_u;
-+
-+typedef struct _mc_debug_t {
-+     unsigned long mc_debug                       : 32;
-+     } mc_debug_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mc_debug_t f;
-+} mc_debug_u;
-+
-+typedef struct _mc_bist_ctrl_t {
-+     unsigned long mc_bist_ctrl                   : 32;
-+     } mc_bist_ctrl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mc_bist_ctrl_t f;
-+} mc_bist_ctrl_u;
-+
-+typedef struct _mc_bist_collar_read_t {
-+     unsigned long mc_bist_collar_read            : 32;
-+     } mc_bist_collar_read_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mc_bist_collar_read_t f;
-+} mc_bist_collar_read_u;
-+
-+typedef struct _tc_mismatch_t {
-+     unsigned long tc_mismatch                    : 24;
-+     unsigned long                                : 8;
-+     } tc_mismatch_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     tc_mismatch_t f;
-+} tc_mismatch_u;
-+
-+typedef struct _mc_perf_mon_cntl_t {
-+     unsigned long clr_perf                       : 1;
-+     unsigned long en_perf                        : 1;
-+     unsigned long                                : 2;
-+     unsigned long perf_op_a                      : 2;
-+     unsigned long perf_op_b                      : 2;
-+     unsigned long                                : 8;
-+     unsigned long monitor_period                 : 8;
-+     unsigned long perf_count_a_overflow          : 1;
-+     unsigned long perf_count_b_overflow          : 1;
-+     unsigned long                                : 6;
-+     } mc_perf_mon_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mc_perf_mon_cntl_t f;
-+} mc_perf_mon_cntl_u;
-+
-+typedef struct _mc_perf_counters_t {
-+     unsigned long mc_perf_counter_a              : 16;
-+     unsigned long mc_perf_counter_b              : 16;
-+     } mc_perf_counters_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     mc_perf_counters_t f;
-+} mc_perf_counters_u;
-+
-+typedef struct _wait_until_t {
-+     unsigned long wait_crtc_pflip                : 1;
-+     unsigned long wait_re_crtc_vline             : 1;
-+     unsigned long wait_fe_crtc_vline             : 1;
-+     unsigned long wait_crtc_vline                : 1;
-+     unsigned long wait_dma_viph0_idle            : 1;
-+     unsigned long wait_dma_viph1_idle            : 1;
-+     unsigned long wait_dma_viph2_idle            : 1;
-+     unsigned long wait_dma_viph3_idle            : 1;
-+     unsigned long wait_dma_vid_idle              : 1;
-+     unsigned long wait_dma_gui_idle              : 1;
-+     unsigned long wait_cmdfifo                   : 1;
-+     unsigned long wait_ov0_flip                  : 1;
-+     unsigned long wait_ov0_slicedone             : 1;
-+     unsigned long                                : 1;
-+     unsigned long wait_2d_idle                   : 1;
-+     unsigned long wait_3d_idle                   : 1;
-+     unsigned long wait_2d_idleclean              : 1;
-+     unsigned long wait_3d_idleclean              : 1;
-+     unsigned long wait_host_idleclean            : 1;
-+     unsigned long wait_extern_sig                : 1;
-+     unsigned long cmdfifo_entries                : 7;
-+     unsigned long                                : 3;
-+     unsigned long wait_both_crtc_pflip           : 1;
-+     unsigned long eng_display_select             : 1;
-+     } wait_until_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     wait_until_t f;
-+} wait_until_u;
-+
-+typedef struct _isync_cntl_t {
-+     unsigned long isync_any2d_idle3d             : 1;
-+     unsigned long isync_any3d_idle2d             : 1;
-+     unsigned long isync_trig2d_idle3d            : 1;
-+     unsigned long isync_trig3d_idle2d            : 1;
-+     unsigned long isync_wait_idlegui             : 1;
-+     unsigned long isync_cpscratch_idlegui        : 1;
-+     unsigned long                                : 26;
-+     } isync_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     isync_cntl_t f;
-+} isync_cntl_u;
-+
-+typedef struct _rbbm_guicntl_t {
-+     unsigned long host_data_swap                 : 2;
-+     unsigned long                                : 30;
-+     } rbbm_guicntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_guicntl_t f;
-+} rbbm_guicntl_u;
-+
-+typedef struct _rbbm_status_t {
-+     unsigned long cmdfifo_avail                  : 7;
-+     unsigned long                                : 1;
-+     unsigned long hirq_on_rbb                    : 1;
-+     unsigned long cprq_on_rbb                    : 1;
-+     unsigned long cfrq_on_rbb                    : 1;
-+     unsigned long hirq_in_rtbuf                  : 1;
-+     unsigned long cprq_in_rtbuf                  : 1;
-+     unsigned long cfrq_in_rtbuf                  : 1;
-+     unsigned long cf_pipe_busy                   : 1;
-+     unsigned long eng_ev_busy                    : 1;
-+     unsigned long cp_cmdstrm_busy                : 1;
-+     unsigned long e2_busy                        : 1;
-+     unsigned long rb2d_busy                      : 1;
-+     unsigned long rb3d_busy                      : 1;
-+     unsigned long se_busy                        : 1;
-+     unsigned long re_busy                        : 1;
-+     unsigned long tam_busy                       : 1;
-+     unsigned long tdm_busy                       : 1;
-+     unsigned long pb_busy                        : 1;
-+     unsigned long                                : 6;
-+     unsigned long gui_active                     : 1;
-+     } rbbm_status_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_status_t f;
-+} rbbm_status_u;
-+
-+typedef struct _rbbm_cntl_t {
-+     unsigned long rb_settle                      : 4;
-+     unsigned long abortclks_hi                   : 3;
-+     unsigned long                                : 1;
-+     unsigned long abortclks_cp                   : 3;
-+     unsigned long                                : 1;
-+     unsigned long abortclks_cfifo                : 3;
-+     unsigned long                                : 2;
-+     unsigned long cpq_data_swap                  : 1;
-+     unsigned long                                : 3;
-+     unsigned long no_abort_idct                  : 1;
-+     unsigned long no_abort_bios                  : 1;
-+     unsigned long no_abort_fb                    : 1;
-+     unsigned long no_abort_cp                    : 1;
-+     unsigned long no_abort_hi                    : 1;
-+     unsigned long no_abort_hdp                   : 1;
-+     unsigned long no_abort_mc                    : 1;
-+     unsigned long no_abort_aic                   : 1;
-+     unsigned long no_abort_vip                   : 1;
-+     unsigned long no_abort_disp                  : 1;
-+     unsigned long no_abort_cg                    : 1;
-+     } rbbm_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_cntl_t f;
-+} rbbm_cntl_u;
-+
-+typedef struct _rbbm_soft_reset_t {
-+     unsigned long soft_reset_cp                  : 1;
-+     unsigned long soft_reset_hi                  : 1;
-+     unsigned long reserved3                      : 3;
-+     unsigned long soft_reset_e2                  : 1;
-+     unsigned long reserved2                      : 2;
-+     unsigned long soft_reset_mc                  : 1;
-+     unsigned long reserved1                      : 2;
-+     unsigned long soft_reset_disp                : 1;
-+     unsigned long soft_reset_cg                  : 1;
-+     unsigned long                                : 19;
-+     } rbbm_soft_reset_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_soft_reset_t f;
-+} rbbm_soft_reset_u;
-+
-+typedef struct _nqwait_until_t {
-+     unsigned long wait_gui_idle                  : 1;
-+     unsigned long                                : 31;
-+     } nqwait_until_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     nqwait_until_t f;
-+} nqwait_until_u;
-+
-+typedef struct _rbbm_debug_t {
-+     unsigned long rbbm_debug                     : 32;
-+     } rbbm_debug_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_debug_t f;
-+} rbbm_debug_u;
-+
-+typedef struct _rbbm_cmdfifo_addr_t {
-+     unsigned long cmdfifo_addr                   : 6;
-+     unsigned long                                : 26;
-+     } rbbm_cmdfifo_addr_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_cmdfifo_addr_t f;
-+} rbbm_cmdfifo_addr_u;
-+
-+typedef struct _rbbm_cmdfifo_datal_t {
-+     unsigned long cmdfifo_datal                  : 32;
-+     } rbbm_cmdfifo_datal_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_cmdfifo_datal_t f;
-+} rbbm_cmdfifo_datal_u;
-+
-+typedef struct _rbbm_cmdfifo_datah_t {
-+     unsigned long cmdfifo_datah                  : 12;
-+     unsigned long                                : 20;
-+     } rbbm_cmdfifo_datah_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_cmdfifo_datah_t f;
-+} rbbm_cmdfifo_datah_u;
-+
-+typedef struct _rbbm_cmdfifo_stat_t {
-+     unsigned long cmdfifo_rptr                   : 6;
-+     unsigned long                                : 2;
-+     unsigned long cmdfifo_wptr                   : 6;
-+     unsigned long                                : 18;
-+     } rbbm_cmdfifo_stat_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     rbbm_cmdfifo_stat_t f;
-+} rbbm_cmdfifo_stat_u;
-+
-+typedef struct _clk_pin_cntl_t {
-+     unsigned long osc_en                         : 1;
-+     unsigned long osc_gain                       : 5;
-+     unsigned long dont_use_xtalin                : 1;
-+     unsigned long xtalin_pm_en                   : 1;
-+     unsigned long xtalin_dbl_en                  : 1;
-+     unsigned long                                : 7;
-+     unsigned long cg_debug                       : 16;
-+     } clk_pin_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     clk_pin_cntl_t f;
-+} clk_pin_cntl_u;
-+
-+typedef struct _pll_ref_fb_div_t {
-+     unsigned long pll_ref_div                    : 4;
-+     unsigned long                                : 4;
-+     unsigned long pll_fb_div_int                 : 6;
-+     unsigned long                                : 2;
-+     unsigned long pll_fb_div_frac                : 3;
-+     unsigned long                                : 1;
-+     unsigned long pll_reset_time                 : 4;
-+     unsigned long pll_lock_time                  : 8;
-+     } pll_ref_fb_div_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     pll_ref_fb_div_t f;
-+} pll_ref_fb_div_u;
-+
-+typedef struct _pll_cntl_t {
-+     unsigned long pll_pwdn                       : 1;
-+     unsigned long pll_reset                      : 1;
-+     unsigned long pll_pm_en                      : 1;
-+     unsigned long pll_mode                       : 1;
-+     unsigned long pll_refclk_sel                 : 1;
-+     unsigned long pll_fbclk_sel                  : 1;
-+     unsigned long pll_tcpoff                     : 1;
-+     unsigned long pll_pcp                        : 3;
-+     unsigned long pll_pvg                        : 3;
-+     unsigned long pll_vcofr                      : 1;
-+     unsigned long pll_ioffset                    : 2;
-+     unsigned long pll_pecc_mode                  : 2;
-+     unsigned long pll_pecc_scon                  : 2;
-+     unsigned long pll_dactal                     : 4;
-+     unsigned long pll_cp_clip                    : 2;
-+     unsigned long pll_conf                       : 3;
-+     unsigned long pll_mbctrl                     : 2;
-+     unsigned long pll_ring_off                   : 1;
-+     } pll_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     pll_cntl_t f;
-+} pll_cntl_u;
-+
-+typedef struct _sclk_cntl_t {
-+     unsigned long sclk_src_sel                   : 2;
-+     unsigned long                                : 2;
-+     unsigned long sclk_post_div_fast             : 4;
-+     unsigned long sclk_clkon_hys                 : 3;
-+     unsigned long sclk_post_div_slow             : 4;
-+     unsigned long disp_cg_ok2switch_en           : 1;
-+     unsigned long sclk_force_reg                 : 1;
-+     unsigned long sclk_force_disp                : 1;
-+     unsigned long sclk_force_mc                  : 1;
-+     unsigned long sclk_force_extmc               : 1;
-+     unsigned long sclk_force_cp                  : 1;
-+     unsigned long sclk_force_e2                  : 1;
-+     unsigned long sclk_force_e3                  : 1;
-+     unsigned long sclk_force_idct                : 1;
-+     unsigned long sclk_force_bist                : 1;
-+     unsigned long busy_extend_cp                 : 1;
-+     unsigned long busy_extend_e2                 : 1;
-+     unsigned long busy_extend_e3                 : 1;
-+     unsigned long busy_extend_idct               : 1;
-+     unsigned long                                : 3;
-+     } sclk_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     sclk_cntl_t f;
-+} sclk_cntl_u;
-+
-+typedef struct _pclk_cntl_t {
-+     unsigned long pclk_src_sel                   : 2;
-+     unsigned long                                : 2;
-+     unsigned long pclk_post_div                  : 4;
-+     unsigned long                                : 8;
-+     unsigned long pclk_force_disp                : 1;
-+     unsigned long                                : 15;
-+     } pclk_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     pclk_cntl_t f;
-+} pclk_cntl_u;
-+
-+typedef struct _clk_test_cntl_t {
-+     unsigned long testclk_sel                    : 4;
-+     unsigned long                                : 3;
-+     unsigned long start_check_freq               : 1;
-+     unsigned long tstcount_rst                   : 1;
-+     unsigned long                                : 15;
-+     unsigned long test_count                     : 8;
-+     } clk_test_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     clk_test_cntl_t f;
-+} clk_test_cntl_u;
-+
-+typedef struct _pwrmgt_cntl_t {
-+     unsigned long pwm_enable                     : 1;
-+     unsigned long                                : 1;
-+     unsigned long pwm_mode_req                   : 2;
-+     unsigned long pwm_wakeup_cond                : 2;
-+     unsigned long pwm_fast_noml_hw_en            : 1;
-+     unsigned long pwm_noml_fast_hw_en            : 1;
-+     unsigned long pwm_fast_noml_cond             : 4;
-+     unsigned long pwm_noml_fast_cond             : 4;
-+     unsigned long pwm_idle_timer                 : 8;
-+     unsigned long pwm_busy_timer                 : 8;
-+     } pwrmgt_cntl_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     pwrmgt_cntl_t f;
-+} pwrmgt_cntl_u;
-+
-+typedef struct _pwrmgt_status_t {
-+     unsigned long pwm_mode                       : 2;
-+     unsigned long                                : 30;
-+     } pwrmgt_status_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     pwrmgt_status_t f;
-+} pwrmgt_status_u;
-+
-+typedef struct _cursor_offset_t {
-+    unsigned long cur_offset                    : 24;
-+    unsigned long cur_x_offset                  : 4;
-+    unsigned long cur_y_offset                  : 4;
-+} cursor_offset_t;
-+
-+typedef union {
-+    unsigned long val : 32;
-+    cursor_offset_t f;
-+} cursor_offset_u;
-+
-+typedef struct _cursor_h_pos_t {
-+    unsigned long cur_h_start                   : 10;
-+    unsigned long                                : 6;
-+    unsigned long cur_h_end                     : 10;
-+    unsigned long                                : 5;
-+    unsigned long cur_en                        : 1;
-+} cursor_h_pos_t;
-+
-+typedef union {
-+    unsigned long val : 32;
-+    cursor_h_pos_t f;
-+} cursor_h_pos_u;
-+
-+typedef struct _cursor_v_pos_t {
-+    unsigned long cur_v_start                   : 10;
-+    unsigned long                                : 6;
-+    unsigned long cur_v_end                     : 10;
-+    unsigned long                                : 6;
-+} cursor_v_pos_t;
-+
-+typedef union {
-+    unsigned long val : 32;
-+    cursor_v_pos_t f;
-+} cursor_v_pos_u;
-+
-+typedef struct _cursor_color_t {
-+     unsigned long cur_color_r                  : 8;
-+     unsigned long cur_color_g                  : 8;
-+     unsigned long cur_color_b                  : 8;
-+     unsigned long                              : 8;
-+} cursor_color_t;
-+
-+typedef union {
-+     unsigned long val : 32;
-+     cursor_color_t f;
-+} cursor_color_u;
-+
-+#endif
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_stub.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_stub.c	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,95 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+#include "imageon.h"
-+#include "imageon_regs.h"
-+#include "klinux.h"
-+
-+extern W100CardEntry w100_cards[];
-+
-+static Bool
-+FindW100(CARD16 vendor, CARD16 device, KdCardAttr * attr)
-+{
-+    CARD8 *mmio;
-+    CARD32 chip_id;
-+    Bool found = FALSE;
-+
-+    mmio = KdMapDevice(W100_REG_BASE, W100_REG_SIZE);
-+    KdSetMappedMode((CARD32) mmio, W100_REG_SIZE,
-+                    KD_MAPPED_MODE_REGISTERS);
-+
-+    chip_id = (*(VOL32 *)(mmio + mmCHIP_ID));
-+    if ((vendor | (device << 16)) == chip_id) {
-+        ErrorF("(I) Found W100 Chip ID: %08x\n\n", chip_id);
-+        attr->deviceID = device;
-+        attr->vendorID = vendor;
-+        found = TRUE;
-+    }
-+    KdUnmapDevice(mmio, W100_REG_SIZE);
-+    return found;
-+}
-+
-+
-+void
-+InitCard(char *name)
-+{
-+    int i;
-+    W100CardEntry *entry;
-+    KdCardAttr attr;
-+
-+    for (entry = w100_cards; entry->name; entry++) {
-+        if (FindW100(entry->vendor, entry->device, &attr)) {
-+            KdCardInfoAdd(&W100Funcs, &attr, 0);
-+            break;
-+        }
-+    }
-+}
-+
-+void
-+InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
-+{
-+    KdInitOutput(pScreenInfo, argc, argv);
-+}
-+
-+void
-+InitInput(int argc, char **argv)
-+{
-+    KdInitInput(&LinuxMouseFuncs, &LinuxKeyboardFuncs);
-+#ifdef TOUCHSCREEN
-+    KdAddMouseDriver(&TsFuncs);
-+#endif
-+}
-+
-+void
-+ddxUseMsg(void)
-+{
-+    KdUseMsg();
-+}
-+
-+int
-+ddxProcessArgument(int argc, char **argv, int i)
-+{
-+    return KdProcessArgument(argc, argv, i);
-+}
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_support.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_support.c	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,1474 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+
-+#include <sys/time.h>
-+
-+#include "imageon.h"
-+#include "imageon_regs.h"
-+#include "imageon_const.h"
-+
-+CARD8 W100SolidRop[16] = {
-+    /* GXclear        */ 0x00,    /* 0 */
-+    /* GXand          */ 0xa0,    /* src AND dst */
-+    /* GXandReverse   */ 0x50,    /* src AND NOT dst */
-+    /* GXcopy         */ 0xf0,    /* src */
-+    /* GXandInverted  */ 0x0a,    /* NOT src AND dst */
-+    /* GXnoop         */ 0xaa,    /* dst */
-+    /* GXxor          */ 0x5a,    /* src XOR dst */
-+    /* GXor           */ 0xfa,    /* src OR dst */
-+    /* GXnor          */ 0x05,    /* NOT src AND NOT dst */
-+    /* GXequiv        */ 0xa5,    /* NOT src XOR dst */
-+    /* GXinvert       */ 0x55,    /* NOT dst */
-+    /* GXorReverse    */ 0xf5,    /* src OR NOT dst */
-+    /* GXcopyInverted */ 0x0f,    /* NOT src */
-+    /* GXorInverted   */ 0xaf,    /* NOT src OR dst */
-+    /* GXnand         */ 0x5f,    /* NOT src OR NOT dst */
-+    /* GXset          */ 0xff,    /* 1 */
-+};
-+
-+CARD8 W100BltRop[16] = {
-+    /* GXclear        */ 0x00,    /* 0 */
-+    /* GXand          */ 0x88,    /* src AND dst */
-+    /* GXandReverse   */ 0x44,    /* src AND NOT dst */
-+    /* GXcopy         */ 0xcc,    /* src */
-+    /* GXandInverted  */ 0x22,    /* NOT src AND dst */
-+    /* GXnoop         */ 0xaa,    /* dst */
-+    /* GXxor          */ 0x66,    /* src XOR dst */
-+    /* GXor           */ 0xee,    /* src OR dst */
-+    /* GXnor          */ 0x11,    /* NOT src AND NOT dst */
-+    /* GXequiv        */ 0x99,    /* NOT src XOR dst */
-+    /* GXinvert       */ 0x55,    /* NOT dst */
-+    /* GXorReverse    */ 0xdd,    /* src OR NOT dst */
-+    /* GXcopyInverted */ 0x33,    /* NOT src */
-+    /* GXorInverted   */ 0xbb,    /* NOT src OR dst */
-+    /* GXnand         */ 0x77,    /* NOT src OR NOT dst */
-+    /* GXset          */ 0xff,    /* 1 */
-+};
-+
-+extern W100ModeSpec w100_modes[];
-+extern W100StartupInfo w100StartupInfo;
-+
-+void W100DisableDisplayUpdate(W100CardInfo *w100c)
-+{
-+    disp_db_buf_cntl_wr_u disp_db_buf_cntl;
-+
-+    disp_db_buf_cntl.f.db_buf_cntl = 30;
-+    disp_db_buf_cntl.f.en_db_buf = 0;
-+    disp_db_buf_cntl.f.update_db_buf = 0;
-+    MMIO_OUT32(mmDISP_DB_BUF_CNTL, disp_db_buf_cntl.val);
-+}
-+
-+void W100EnableDisplayUpdate(W100CardInfo *w100c)
-+{
-+    disp_db_buf_cntl_wr_u disp_db_buf_cntl;
-+
-+    disp_db_buf_cntl.f.db_buf_cntl = 30;
-+    disp_db_buf_cntl.f.en_db_buf = 1;
-+    disp_db_buf_cntl.f.update_db_buf = 1;
-+    MMIO_OUT32(mmDISP_DB_BUF_CNTL, disp_db_buf_cntl.val);
-+}
-+
-+void W100SetupGraphicEngine(W100CardInfo *w100c)
-+{
-+    eng_cntl_u eng_cntl;
-+    sc_bottom_right_u bottomright;
-+    rbbm_cntl_u rbbm_cntl;
-+    dst_pitch_u dpitch;
-+    dst_offset_u doffset;
-+    src_pitch_u spitch;
-+    src_offset_u soffset;
-+    sc_top_left_u tl;
-+    sc_bottom_right_u br;
-+    src_sc_bottom_right_u srcbr;
-+    dp_gui_master_cntl_u gmc;
-+    dp_mix_u dp_mix;
-+    dp_cntl_u dp_cntl;
-+    dp_datatype_u dp_datatype;
-+
-+    DBG_IMAGEON(("W100SetupGraphicEngine(offset:%p, pitch:%d)\n",
-+                 w100c->hw_window.offset, 
-+                 w100c->hw_window.width));
-+
-+    eng_cntl.val = MMIO_IN32(mmENG_CNTL);
-+    eng_cntl.f.erc_reg_wr_ws = 0;
-+    MMIO_OUT32(mmENG_CNTL, eng_cntl.val);
-+
-+    rbbm_cntl.val = 0;
-+    rbbm_cntl.f.abortclks_hi = 4;
-+    rbbm_cntl.f.abortclks_cp = 4;
-+    rbbm_cntl.f.abortclks_cfifo = 2;
-+    MMIO_OUT32(mmRBBM_CNTL, rbbm_cntl.val);
-+
-+    bottomright.val = 0;
-+    bottomright.f.sc_bottom = 0x1fff;
-+    bottomright.f.sc_right = 0x1fff;
-+    MMIO_OUT32(mmDEFAULT_SC_BOTTOM_RIGHT, bottomright.val);
-+
-+    dpitch.val = 0;
-+    dpitch.f.dst_pitch = w100c->hw_window.width;
-+    MMIO_OUT32(mmDST_PITCH, dpitch.val);
-+
-+    doffset.val = 0;
-+    doffset.f.dst_offset = (CARD32) w100c->hw_window.offset;
-+    MMIO_OUT32(mmDST_OFFSET, doffset.val);
-+
-+    spitch.val = 0;
-+    spitch.f.src_pitch = w100c->hw_window.width;
-+    MMIO_OUT32(mmSRC_PITCH, spitch.val);
-+    soffset.val = 0;
-+    soffset.f.src_offset = (CARD32) w100c->hw_window.offset;
-+    MMIO_OUT32(mmSRC_OFFSET, soffset.val);
-+
-+    tl.f.sc_left = tl.f.sc_top = 0;
-+    br.f.sc_right = br.f.sc_bottom = 0x1fff;
-+    MMIO_OUT32(mmSC_TOP_LEFT, tl.val);
-+    MMIO_OUT32(mmSC_BOTTOM_RIGHT, br.val);
-+
-+    srcbr.f.sc_right = srcbr.f.sc_bottom = 0x1fff;
-+    MMIO_OUT32(mmSRC_SC_BOTTOM_RIGHT, br.val);
-+
-+    gmc.val = dp_datatype.val = dp_mix.val = dp_cntl.val = 0;
-+
-+    dp_cntl.f.dst_x_dir = 1;
-+    dp_cntl.f.dst_y_dir = 1;
-+    dp_cntl.f.src_x_dir = 1;
-+    dp_cntl.f.src_y_dir = 1;
-+    dp_cntl.f.dst_major_x = 1;
-+    dp_cntl.f.src_major_x = 1;
-+    MMIO_OUT32(mmDP_CNTL, dp_cntl.val);
-+
-+    gmc.f.gmc_src_pitch_offset_cntl = 1;
-+    gmc.f.gmc_dst_pitch_offset_cntl = 1;
-+    gmc.f.gmc_src_clipping = 1;
-+    gmc.f.gmc_dst_clipping = 1;
-+    gmc.f.gmc_brush_datatype = DP_BRUSH_SOLIDCOLOR;
-+    gmc.f.gmc_dst_datatype = DP_DST_16BPP_1555;
-+    gmc.f.gmc_src_datatype = DP_SRC_SOLID_COLOR_BLT;
-+    gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB;
-+    gmc.f.gmc_default_sel = 0;
-+    gmc.f.gmc_rop3 = W100SolidRop[GXcopy];
-+    gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR;
-+    gmc.f.gmc_clr_cmp_fcn_dis = 1;
-+    gmc.f.gmc_wr_msk_dis = 1;
-+    gmc.f.gmc_dp_op = DP_OP_ROP;
-+    MMIO_OUT32(mmDP_GUI_MASTER_CNTL, gmc.val);
-+
-+    dp_datatype.f.dp_dst_datatype = gmc.f.gmc_dst_datatype;
-+    dp_datatype.f.dp_brush_datatype = gmc.f.gmc_brush_datatype;
-+    dp_datatype.f.dp_src2_type = 0;
-+    dp_datatype.f.dp_src2_datatype = gmc.f.gmc_src_datatype;
-+    dp_datatype.f.dp_src_datatype = gmc.f.gmc_src_datatype;
-+    dp_datatype.f.dp_byte_pix_order = gmc.f.gmc_byte_pix_order;
-+    MMIO_OUT32(mmDP_DATATYPE, dp_datatype.val);
-+
-+    dp_mix.f.dp_src_source = gmc.f.gmc_dp_src_source;
-+    dp_mix.f.dp_src2_source = gmc.f.gmc_dp_src_source;
-+    dp_mix.f.dp_rop3 = gmc.f.gmc_rop3;
-+    dp_mix.f.dp_op = gmc.f.gmc_dp_op;
-+    MMIO_OUT32(mmDP_MIX, dp_mix.val);
-+}
-+
-+void W100ResetGraphicEngine(W100CardInfo *w100c)
-+{
-+    rbbm_soft_reset_u sreset;
-+    sclk_cntl_u sclk_cntl;
-+    CARD32 restore_sclk;
-+
-+    ErrorF("->W100ResetGraphicEngine\n");
-+    sclk_cntl.val = restore_sclk = MMIO_IN32(mmSCLK_CNTL);
-+
-+    sclk_cntl.f.sclk_force_e2   = 1;
-+    sclk_cntl.f.sclk_force_e3   = 1;
-+    sclk_cntl.f.sclk_force_idct = 1;
-+    MMIO_OUT32(mmSCLK_CNTL, sclk_cntl.val);
-+    
-+    sreset.val = 0;
-+    sreset.f.soft_reset_e2 = 1;
-+    MMIO_OUT32(mmRBBM_SOFT_RESET, sreset.val);
-+    sreset.f.soft_reset_e2 = 0;
-+    MMIO_OUT32(mmRBBM_SOFT_RESET, 0);
-+
-+    MMIO_OUT32(mmSCLK_CNTL, restore_sclk);
-+    ErrorF("<-W100ResetGraphicEngine\n");
-+}
-+
-+W100ModeSpec *W100GetModeSpec(W100CardInfo *w100c, W100Mode *mode)
-+{
-+    W100ModeSpec *modes;
-+    for (modes = w100_modes; modes->width; modes++) {
-+        if ((modes->bpp == mode->bpp) &&
-+            (((modes->width == mode->width) &&
-+              (modes->height == mode->height)) ||
-+             ((modes->width == mode->height) &&
-+              (modes->height == mode->width)))) {
-+            return modes;
-+        }
-+    }
-+    ErrorF("No matching mode spec for %dx%d@%d\n", 
-+           mode->width, mode->height, mode->bpp);
-+    return NULL;
-+}
-+
-+W100ModeSpec *W100GetBestMode(W100CardInfo *w100c, int width, int height)
-+{
-+    unsigned int best_x = 0xffffffff;
-+    unsigned int best_y = 0xffffffff;
-+    W100ModeSpec *modes, *best_mode = NULL;
-+    for (modes = w100_modes; modes->width; modes++) {
-+        if (modes->supported) {
-+            if (((modes->width >= width) && (modes->width < best_x)) &&
-+                ((modes->height >= height) && (modes->height < best_y))) {
-+                best_mode = modes;
-+                best_x = modes->width;
-+                best_y = modes->height;
-+            } else if (((modes->width >= height) && (modes->width < best_y)) &&
-+                       ((modes->height >= width) && (modes->height < best_x))) {
-+                best_mode = modes;
-+                best_x = modes->height;
-+                best_y = modes->width;
-+            }
-+        }
-+    }
-+    if (!best_mode) {
-+        ErrorF("No matching mode spec for %dx%d\n", width, height);
-+    }
-+    return best_mode;
-+}
-+
-+Bool W100GetFbMode(W100CardInfo *w100c, W100Mode *mode)
-+{
-+    struct fb_var_screeninfo vinfo;
-+    int i;
-+
-+    if (ioctl(w100c->fbdev.fd, FBIOGET_VSCREENINFO, &vinfo) != 0) {
-+        ErrorF("Unable to get framebuffer mode\n");
-+        return FALSE;
-+    }
-+
-+    mode->width = vinfo.xres;
-+    mode->height = vinfo.yres;
-+    mode->bpp = vinfo.bits_per_pixel;
-+}
-+
-+Bool W100CheckFbMode(W100CardInfo *w100c, W100ModeSpec *modes)
-+{
-+    struct fb_var_screeninfo vinfo;
-+
-+    vinfo.xres = vinfo.xres_virtual = modes->width;
-+    vinfo.yres = vinfo.yres_virtual = modes->height;
-+    vinfo.bits_per_pixel            = modes->bpp;
-+    vinfo.activate = FB_ACTIVATE_TEST;
-+    
-+    if (ioctl(w100c->fbdev.fd, FBIOPUT_VSCREENINFO, &vinfo) != 0) {
-+        ErrorF("(W) Mode %dx%d@%d not supported\n", 
-+               vinfo.xres,
-+               vinfo.yres,
-+               vinfo.bits_per_pixel);
-+        return FALSE;
-+    }
-+    DBG_IMAGEON(("(I) Mode %dx%d@%d supported\n", 
-+                 vinfo.xres,
-+                 vinfo.yres,
-+                 vinfo.bits_per_pixel));
-+    return TRUE;
-+}
-+
-+Bool W100SetFbMode(W100CardInfo *w100c)
-+{
-+    struct fb_var_screeninfo vinfo;
-+    int randr = KdSubRotation(w100c->hw_window.randr, w100StartupInfo.randr);
-+
-+    if (randr & (RR_Rotate_0 | RR_Rotate_180)) {
-+        vinfo.xres = vinfo.xres_virtual = w100c->hw_window.mode->width;
-+        vinfo.yres = vinfo.yres_virtual = w100c->hw_window.mode->height;
-+    } else {
-+        vinfo.xres = vinfo.xres_virtual = w100c->hw_window.mode->height;
-+        vinfo.yres = vinfo.yres_virtual = w100c->hw_window.mode->width;
-+    }
-+    vinfo.bits_per_pixel            = w100c->hw_window.mode->bpp;
-+    vinfo.activate = FB_ACTIVATE_NOW;
-+    int flip = (w100c->hw_window.randr > RR_Rotate_90) ? 1 : 0;
-+
-+    DBG_IMAGEON(("Asking framebuffer for mode %dx%d@%d. Flipped:%d\n",
-+                 vinfo.xres, vinfo.yres, vinfo.bits_per_pixel, flip));
-+    if (ioctl(w100c->fbdev.fd, FBIOPUT_VSCREENINFO, &vinfo) != 0) {
-+        ErrorF("Error setting mode %dx%d@%d\n", 
-+               vinfo.xres,
-+               vinfo.yres,
-+               vinfo.bits_per_pixel);
-+        return FALSE;
-+    }
-+    W100SysFsSet(w100c, W100_SYSFS_BASE "flip", flip ? "1" : "0");
-+    return TRUE;
-+}
-+
-+void W100SetupGraphicWindow(W100CardInfo *w100c)
-+{
-+    DBG_IMAGEON(("W100SetupGraphicWindow(width:%d,height:%d,randr:%d)\n",
-+                 w100c->hw_window.width,
-+                 w100c->hw_window.height,
-+                 w100c->hw_window.randr));
-+
-+    if (!W100SetFbMode(w100c)) {
-+        ErrorF("Error Setting Graphic Window\n");
-+    }
-+}
-+
-+void W100EnableGraphicWindow(W100CardInfo *w100c)
-+{
-+    graphic_ctrl_u gc;
-+    
-+    gc.val = MMIO_IN32(mmGRAPHIC_CTRL);
-+    gc.f.en_graphic_crtc = 1;
-+    gc.f.en_graphic_req = 1;
-+    W100DisableDisplayUpdate(w100c);
-+    MMIO_OUT32(mmGRAPHIC_CTRL, gc.val);
-+    W100EnableDisplayUpdate(w100c);
-+}
-+
-+void W100DisableGraphicWindow(W100CardInfo *w100c)
-+{
-+    graphic_ctrl_u gc;
-+    
-+    gc.val = MMIO_IN32(mmGRAPHIC_CTRL);
-+    gc.f.en_graphic_crtc = 0;
-+    gc.f.en_graphic_req = 0;
-+    W100DisableDisplayUpdate(w100c);
-+    MMIO_OUT32(mmGRAPHIC_CTRL, gc.val);
-+    W100EnableDisplayUpdate(w100c);
-+}
-+
-+inline Bool W100WaitCmdFifoEntries(W100CardInfo *w100c, int entries)
-+{
-+    rbbm_status_u rbbmStatus;
-+    TIMEOUT_LOCALS;
-+
-+    if (entries > W100_CMDFIFO_SIZE)
-+        return FALSE;
-+
-+    if (entries <= w100c->cmdfifo_entries) {
-+        w100c->cmdfifo_entries -= entries;
-+        return TRUE;
-+    }
-+
-+    WHILE_NOT_TIMEOUT(.2) {
-+        rbbmStatus.val = MMIO_IN32(mmRBBM_STATUS);
-+        w100c->cmdfifo_entries = rbbmStatus.f.cmdfifo_avail;
-+        if (w100c->cmdfifo_entries >= entries) {
-+            break;
-+        }
-+    }
-+    if (TIMEDOUT()) {
-+        ErrorF("Not enough CMDFIFO entries: %d (%d needed)\n", 
-+               w100c->cmdfifo_entries, entries);
-+        return FALSE;
-+    }
-+    w100c->cmdfifo_entries -= entries;
-+    return TRUE;
-+}
-+
-+Bool W100WaitIdle(W100CardInfo *w100c)
-+{
-+    rbbm_status_u rbbm_status;
-+    TIMEOUT_LOCALS;
-+
-+    DBG_IMAGEON(("W100WaitIdle\n"));
-+    if (!W100WaitCmdFifoEntries(w100c, W100_CMDFIFO_SIZE)) {
-+        return FALSE;
-+    }
-+
-+    WHILE_NOT_TIMEOUT(.2) {
-+        rbbm_status.val = MMIO_IN32(mmRBBM_STATUS);
-+        if (rbbm_status.f.gui_active == 0) {
-+            break;
-+        }
-+    }
-+    if (TIMEDOUT()) {
-+        ErrorF("Timeout waiting for idle. rbbm_status: 0x%08x\n"
-+               "  .cmdfifo_avail   : %d\n"
-+               "  .cf_pipe_busy    : %d\n"
-+               "  .eng_ev_busy     : %d\n"
-+               "  .cp_cmdstrm_busy : %d\n"
-+               "  .e2_busy         : %d\n"
-+               "  .rb2d_busy       : %d\n"
-+               "  .rb3d_busy       : %d\n"
-+               "  .se_busy         : %d\n"
-+               "  .re_busy         : %d\n"
-+               "  .tam_busy        : %d\n"
-+               "  .tdm_busy        : %d\n"
-+               "  .pb_busy         : %d\n"
-+               "  .gui_active      : %d\n",
-+               rbbm_status.val,
-+               rbbm_status.f.cmdfifo_avail,
-+               rbbm_status.f.cf_pipe_busy,
-+               rbbm_status.f.eng_ev_busy,
-+               rbbm_status.f.cp_cmdstrm_busy,
-+               rbbm_status.f.e2_busy,
-+               rbbm_status.f.rb2d_busy,
-+               rbbm_status.f.rb3d_busy,
-+               rbbm_status.f.se_busy,
-+               rbbm_status.f.re_busy,
-+               rbbm_status.f.tam_busy,
-+               rbbm_status.f.tdm_busy,
-+               rbbm_status.f.pb_busy,
-+               rbbm_status.f.gui_active);
-+        ErrorF("Last context:  src(datatype:%d,pitch:%d,offset:0x%08x)\n"
-+               "               dst(datatype:%d,pitch:%d,offset:0x%08x)\n"
-+               "               xform(dx:%d,dy:%d)\n"
-+               "               mask(pm:0x%08x,enable:%d)\n",
-+               w100c->ctx.src.datatype,
-+               w100c->ctx.src.pitch,
-+               w100c->ctx.src.offset,
-+               w100c->ctx.dst.datatype,
-+               w100c->ctx.dst.pitch,
-+               w100c->ctx.dst.offset,
-+               w100c->ctx.xform.dx,
-+               w100c->ctx.xform.dy,
-+               w100c->ctx.mask.pm,
-+               w100c->ctx.mask.enable);
-+
-+        return FALSE;
-+    }
-+
-+    return TRUE;
-+}
-+
-+void W100ResetContext(W100CardInfo *w100c)
-+{
-+    w100c->ctx.dst.datatype = DP_DST_16BPP_1555;
-+    w100c->ctx.dst.pitch = 0;
-+    w100c->ctx.dst.offset = 0;
-+    w100c->ctx.dst.videomem = 0;
-+
-+    w100c->ctx.src.datatype = DP_SRC_COLOR_SAME_AS_DST;
-+    w100c->ctx.src.pitch = 0;
-+    w100c->ctx.src.offset = 0;
-+    w100c->ctx.src.videomem = 0;
-+
-+    w100c->ctx.xform.dx = 0;
-+    w100c->ctx.xform.dy = 0;
-+    w100c->ctx.xform.randr = 0;
-+    w100c->ctx.xform.mirror = FALSE;
-+    w100c->ctx.xform.dataPath = 0x0000003f;
-+
-+    w100c->ctx.mask.pm = 0;
-+    w100c->ctx.mask.enable = FALSE;
-+}
-+
-+CARD32 W100ComputeSolidGmc(W100CardInfo *w100c, CARD8 alu)
-+{
-+    dp_gui_master_cntl_u gmc;
-+
-+    gmc.val = 0;
-+    gmc.f.gmc_dst_pitch_offset_cntl = 1;
-+    gmc.f.gmc_dst_clipping = 0;
-+    gmc.f.gmc_brush_datatype = DP_BRUSH_SOLIDCOLOR;
-+    gmc.f.gmc_dst_datatype = w100c->ctx.dst.datatype;
-+    gmc.f.gmc_dp_op = DP_OP_ROP;
-+    gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB;
-+    gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR;
-+    gmc.f.gmc_rop3 = W100SolidRop[alu];
-+    gmc.f.gmc_clr_cmp_fcn_dis = 1;
-+    if (w100c->ctx.mask.enable) {
-+        gmc.f.gmc_wr_msk_dis = 0;
-+    } else {
-+        gmc.f.gmc_wr_msk_dis = 1;
-+    }
-+    return gmc.val;
-+}
-+
-+CARD32 W100ComputeCopyGmc(W100CardInfo *w100c, CARD8 alu)
-+{
-+    dp_gui_master_cntl_u gmc;
-+
-+    gmc.val = 0;
-+    gmc.f.gmc_src_pitch_offset_cntl = 1;
-+    gmc.f.gmc_dst_pitch_offset_cntl = 1;
-+    gmc.f.gmc_dst_clipping = 0;
-+    gmc.f.gmc_src_clipping = 0;
-+    gmc.f.gmc_src_datatype = w100c->ctx.src.datatype;
-+    gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR;
-+    gmc.f.gmc_brush_datatype = DP_BRUSH_NONE;
-+    gmc.f.gmc_dst_datatype = w100c->ctx.dst.datatype;
-+    gmc.f.gmc_dp_op = DP_OP_ROP;
-+    gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB;
-+    gmc.f.gmc_rop3 = W100BltRop[alu];
-+    gmc.f.gmc_clr_cmp_fcn_dis = 1;
-+    if (w100c->ctx.mask.enable) {
-+        gmc.f.gmc_wr_msk_dis = 0;
-+    } else {
-+        gmc.f.gmc_wr_msk_dis = 1;
-+    }
-+    return gmc.val;
-+}
-+
-+CARD32 W100ComputeAritGmc(W100CardInfo *w100c, CARD8 alu)
-+{
-+    dp_gui_master_cntl_u gmc;
-+
-+    gmc.val = 0;
-+    gmc.f.gmc_src_pitch_offset_cntl = 1;
-+    gmc.f.gmc_dst_pitch_offset_cntl = 1;
-+    gmc.f.gmc_dst_clipping = 0;
-+    gmc.f.gmc_src_clipping = 0;
-+    gmc.f.gmc_src_datatype = w100c->ctx.src.datatype;
-+    gmc.f.gmc_dst_datatype = w100c->ctx.dst.datatype;
-+    gmc.f.gmc_dp_src_source = DP_SRC_MEM_RECTANGULAR;
-+    gmc.f.gmc_brush_datatype = DP_BRUSH_NONE;
-+    gmc.f.gmc_dp_op = DP_OP_ARITHMETIC;
-+    gmc.f.gmc_byte_pix_order = DP_PIX_ORDER_LSB2MSB;
-+    gmc.f.gmc_rop3 = W100BltRop[alu];
-+    gmc.f.gmc_clr_cmp_fcn_dis = 1;
-+    if (w100c->ctx.mask.enable) {
-+        gmc.f.gmc_wr_msk_dis = 0;
-+    } else {
-+        gmc.f.gmc_wr_msk_dis = 1;
-+    }
-+    return gmc.val;
-+}
-+
-+void W100SetXForm(W100CardInfo *w100c, int dx, int dy)
-+{
-+    dp_cntl_u dp_cntl;
-+
-+    w100c->ctx.xform.dx = dx;
-+    w100c->ctx.xform.dy = dy;
-+
-+    dp_cntl.val = 0;
-+    dp_cntl.f.src_x_dir = 1;
-+    dp_cntl.f.src_y_dir = 1;
-+    dp_cntl.f.src_major_x = 1;
-+    dp_cntl.f.dst_major_x = 1;
-+
-+    if (dx >= 0) {
-+        dp_cntl.f.dst_x_dir = 1;
-+    } else {
-+        dp_cntl.f.dst_x_dir = 0;
-+    }
-+    if (dy >= 0) {
-+        dp_cntl.f.dst_y_dir = 1;
-+    } else {
-+        dp_cntl.f.dst_y_dir = 0;
-+    }
-+    w100c->ctx.xform.dataPath = dp_cntl.val;
-+}
-+
-+void W100SetRotation(W100CardInfo *w100c, 
-+                     int randr, 
-+                     Bool mirror)
-+{
-+    dp_cntl_u dp_cntl;
-+    w100c->ctx.xform.randr = randr;
-+    w100c->ctx.xform.mirror = mirror;
-+    dp_cntl.val = 0;
-+    dp_cntl.f.src_x_dir = 1;
-+    dp_cntl.f.src_y_dir = 1;
-+    dp_cntl.f.src_major_x = 1;
-+
-+
-+    switch (randr & RR_Rotate_All) {
-+    case RR_Rotate_0:
-+        dp_cntl.f.dst_x_dir   = mirror ? 0 : 1;
-+        dp_cntl.f.dst_y_dir   = 1;
-+        dp_cntl.f.dst_major_x = 1;
-+        break;
-+    case RR_Rotate_90:
-+        dp_cntl.f.dst_x_dir   = 0;
-+        dp_cntl.f.dst_y_dir   = mirror ? 0 : 1; 
-+        dp_cntl.f.dst_major_x = 0;
-+        break;
-+    case RR_Rotate_180:
-+        dp_cntl.f.dst_x_dir   = mirror ? 1 : 0;
-+        dp_cntl.f.dst_y_dir   = 0;
-+        dp_cntl.f.dst_major_x = 1;
-+        break;
-+    case RR_Rotate_270:
-+        dp_cntl.f.dst_x_dir   = 1;
-+        dp_cntl.f.dst_y_dir   = mirror ? 1 : 0;
-+        dp_cntl.f.dst_major_x = 0;
-+        break;
-+    }
-+    w100c->ctx.xform.dataPath = dp_cntl.val;        
-+}
-+
-+void W100SetPixelMask(W100CardInfo *w100c, Pixel mask)
-+{
-+    if (mask != 0xffffffff) {
-+        w100c->ctx.mask.enable = TRUE;
-+        w100c->ctx.mask.pm = mask;
-+    } else {
-+        w100c->ctx.mask.enable = FALSE;
-+    }
-+}
-+
-+Bool W100SetSource(KdScreenInfo *screen, 
-+                   CARD32 srcPitch, 
-+                   CARD32 srcOffset, 
-+                   CARD8 bpp)
-+{
-+    W100CardInfo(screen);
-+    int i;
-+    w100c->ctx.src.pitch = srcPitch * 8 / bpp;
-+    switch (bpp) {
-+    case 1:
-+        w100c->ctx.src.datatype = DP_SRC_1BPP_OPA;
-+        break;
-+    case 4:
-+        w100c->ctx.src.datatype = DP_SRC_4BPP;
-+        break;
-+    case 12:
-+        w100c->ctx.src.datatype = DP_SRC_12BPP_PACKED;
-+        break;
-+    case 8:
-+    case 16:
-+        w100c->ctx.src.datatype = DP_SRC_COLOR_SAME_AS_DST;
-+        break;
-+    default:
-+        return FALSE;
-+    }
-+
-+    for (i = 0; i < screen->num_videomem_areas; i++) {
-+        KdVideoMemArea *vidmem = screen->videomem_areas[i];
-+        if ((((CARD8*)srcOffset) >= vidmem->base) &&
-+            (((CARD8*)srcOffset) <= (vidmem->base + vidmem->size))) {
-+            w100c->ctx.src.offset = (CARD32) W100_HOST2CARD(srcOffset);
-+            if (w100c->last_src_videomem != i) {
-+                W100WaitIdle(w100c);
-+            }
-+            w100c->last_src_videomem = i;
-+            DBG_IMAGEON(("Setting src(pitch:%d,offset:0x%08x,type:%d)\n",
-+                         w100c->ctx.src.pitch,
-+                         w100c->ctx.src.offset,
-+                         w100c->ctx.src.datatype));
-+            return TRUE;
-+        }
-+    }
-+    return FALSE;
-+}
-+
-+Bool W100SetDestination(KdScreenInfo *screen,
-+                        CARD32 dstPitch, 
-+                        CARD32 dstOffset, 
-+                        CARD8 bpp)
-+{
-+    W100CardInfo(screen);
-+    int i;
-+    w100c->ctx.dst.pitch = dstPitch * 8 / bpp;
-+    switch (bpp) {
-+    case 8:
-+        w100c->ctx.dst.datatype = DP_DST_8BPP;
-+        break;
-+    case 16:
-+        w100c->ctx.dst.datatype = DP_DST_16BPP_1555;
-+        break;
-+    default:
-+        return FALSE;
-+    }
-+
-+    for (i = 0; i < screen->num_videomem_areas; i++) {
-+        KdVideoMemArea *vidmem = screen->videomem_areas[i];
-+        if ((((CARD8*)dstOffset) >= vidmem->base) &&
-+            (((CARD8*)dstOffset) <= (vidmem->base + vidmem->size))) {
-+            w100c->ctx.dst.offset = (CARD32) W100_HOST2CARD(dstOffset);
-+            if (w100c->last_dst_videomem != i) {
-+                W100WaitIdle(w100c);
-+            }
-+            w100c->last_dst_videomem = i;
-+            DBG_IMAGEON(("Setting dst(pitch:%d,offset:0x%08x,type:%d)\n",
-+                         w100c->ctx.dst.pitch,
-+                         w100c->ctx.dst.offset,
-+                         w100c->ctx.dst.datatype));
-+            return TRUE;
-+        }
-+    }
-+    return FALSE;
-+}
-+        
-+Bool W100SetSourcePixmap(PixmapPtr pPix)
-+{
-+    KdScreenPriv(pPix->drawable.pScreen);
-+
-+    return W100SetSource(pScreenPriv->screen,
-+                         pPix->devKind, 
-+                         (CARD32) pPix->devPrivate.ptr,
-+                         pPix->drawable.bitsPerPixel);
-+}
-+
-+Bool W100SetDestinationPixmap(PixmapPtr pPix)
-+{
-+    KdScreenPriv(pPix->drawable.pScreen);
-+
-+    return W100SetDestination(pScreenPriv->screen,
-+                              pPix->devKind, 
-+                              (CARD32) pPix->devPrivate.ptr,
-+                              pPix->drawable.bitsPerPixel);
-+}
-+
-+void W100MapToDevice(W100CardInfo *w100c, BoxPtr src, BoxPtr dst)
-+{
-+    switch (w100c->hw_window.randr & RR_Rotate_All) {
-+    case RR_Rotate_0:
-+        dst->x1 = src->x1;
-+        dst->y1 = src->y1;
-+        dst->x2 = src->x2;
-+        dst->y2 = src->y2;
-+        break;
-+    case RR_Rotate_90:
-+        dst->x1 = w100c->hw_window.height - src->y2 - 1;
-+        dst->y1 = src->x1;
-+        dst->x2 = w100c->hw_window.height - src->y1 - 1;
-+        dst->y2 = src->x2;
-+        break;
-+    case RR_Rotate_180:
-+        dst->x1 = w100c->hw_window.width - src->x2 - 1;
-+        dst->y1 = w100c->hw_window.height - src->y2 - 1;
-+        dst->x2 = w100c->hw_window.width - src->x1 - 1;
-+        dst->y2 = w100c->hw_window.height - src->y1 - 1;
-+        break;
-+    case RR_Rotate_270:
-+        dst->x1 = src->y1;
-+        dst->y1 = w100c->hw_window.width - src->x2 - 1;
-+        dst->x2 = src->y2;
-+        dst->y2 = w100c->hw_window.width - src->x1 - 1;
-+        break;
-+    }
-+    DBG_IMAGEON(("MapToDevice (x1:%d,y1:%d,x2:%d,y2:%d)->(x1:%d,y1:%d,x2:%d,y2:%d)\n",
-+                 src->x1, src->y1, src->x2, src->y2,
-+                 dst->x1, dst->y1, dst->x2, dst->y2));
-+}
-+
-+void W100MapFromDevice(W100CardInfo *w100c, BoxPtr src, BoxPtr dst)
-+{
-+    switch (w100c->hw_window.randr & RR_Rotate_All) {
-+    case RR_Rotate_0:
-+        dst->x1 = src->x1;
-+        dst->y1 = src->y1;
-+        dst->x2 = src->x2;
-+        dst->y2 = src->y2;
-+        break;
-+    case RR_Rotate_90:
-+        dst->x1 = src->y1;
-+        dst->y1 = w100c->hw_window.height - src->x2 - 1;
-+        dst->x2 = src->y2;
-+        dst->y2 = w100c->hw_window.height - src->x1 - 1;
-+        break;
-+    case RR_Rotate_180:
-+        dst->x1 = w100c->hw_window.width - src->x2 - 1;
-+        dst->y1 = w100c->hw_window.height - src->y2 - 1;
-+        dst->x2 = w100c->hw_window.width - src->x1 - 1;
-+        dst->y2 = w100c->hw_window.height - src->y1 - 1;
-+        break;
-+    case RR_Rotate_270:
-+        dst->x1 = w100c->hw_window.height - src->y2 - 1;
-+        dst->y1 = src->x1;
-+        dst->x2 = w100c->hw_window.width - src->y1 - 1;
-+        dst->y2 = src->x2;
-+        break;
-+    }
-+    DBG_IMAGEON(("MapFromDevice (x1:%d,y1:%d,x2:%d,y2:%d)->(x1:%d,y1:%d,x2:%d,y2:%d)\n",
-+                 src->x1, src->y1, src->x2, src->y2,
-+                 dst->x1, dst->y1, dst->x2, dst->y2));
-+}
-+
-+void W100MoveTo(BoxPtr src, int x, int y)
-+{
-+    src->x1 += x;
-+    src->y1 += y;
-+    src->x2 += x;
-+    src->y2 += y;
-+}
-+
-+void W100ChangeOrigin(BoxPtr src, int x, int y)
-+{
-+    src->x1 -= x;
-+    src->y1 -= y;
-+    src->x2 -= x;
-+    src->y2 -= y;
-+}
-+
-+void W100ScaleBox(BoxPtr src, BoxPtr dst, int scale)
-+{
-+    if (scale >= 0) {
-+        dst->x1 = src->x1 << scale;
-+        dst->x2 = src->x2 << scale;
-+        dst->y1 = src->y1 << scale;
-+        dst->y2 = src->y2 << scale;
-+    } else {
-+        dst->x1 = src->x1 >> -scale;
-+        dst->x2 = src->x2 >> -scale;
-+        dst->y1 = src->y1 >> -scale;
-+        dst->y2 = src->y2 >> -scale;
-+    }
-+}
-+
-+void W100TrajectoryOrigin(W100CardInfo *w100c, BoxPtr box, short *x, short *y)
-+{
-+    switch (w100c->ctx.xform.randr & RR_Rotate_All) {
-+    case RR_Rotate_0:
-+        if (w100c->ctx.xform.mirror) {
-+            *x = box->x2;
-+        } else {
-+            *x = box->x1;
-+        }
-+        *y = box->y1;
-+        break;
-+    case RR_Rotate_90:
-+        *x = box->x2;
-+        if (w100c->ctx.xform.mirror) {
-+            *y = box->y2;
-+        } else {
-+            *y = box->y1;
-+        }
-+        break;
-+    case RR_Rotate_180:
-+        if (w100c->ctx.xform.mirror) {
-+            *x = box->x1;
-+        } else {
-+            *x = box->x2;
-+        }
-+        *y = box->y2;
-+        break;
-+    case RR_Rotate_270:
-+        *x = box->x1;
-+        if (w100c->ctx.xform.mirror) {
-+            *y = box->y1;
-+        } else {
-+            *y = box->y2;
-+        }
-+    }
-+}
-+    
-+CARD8 W100GetScaler(CARD16 dstsize, CARD16 srcsize)
-+{
-+    return W100_MAX(1, W100_MIN(31, ((16 * srcsize) + dstsize - 1) / dstsize));
-+
-+}
-+
-+CARD16 W100ApplyScaler(CARD16 srcsize, CARD8 scaler)
-+{
-+    return ((srcsize * 16) + (scaler - 1)) / scaler;
-+}
-+
-+
-+static void W100Blt(KdScreenInfo *screen,
-+                    int randr, int bpp,
-+                    CARD32 srcOffset,
-+                    CARD16 srcPitch,
-+                    BoxPtr srcBox,
-+                    CARD32 dstOffset,
-+                    CARD16 dstPitch,
-+                    BoxPtr dstBox)
-+{
-+    ScreenPtr pScreen = screen->pScreen;
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    int fifoEntries = 9;
-+    Bool hasXForm = FALSE;
-+    eng_cntl_u eng_cntl;
-+    src_x_y_u src_x_y;
-+    dst_x_y_u dst_x_y;
-+    src_width_u src_width;
-+    src_height_u src_height;
-+    dst_width_height_u dst_width_height;
-+    CARD16 dstX;
-+    CARD16 dstY;
-+
-+    if (randr & (RR_Rotate_90|RR_Rotate_270)) {
-+        hasXForm = TRUE;
-+        eng_cntl.val = w100c->regs.ENG_CNTL;
-+        eng_cntl.f.dis_rop_src_uses_dst_w_h = 1;
-+        eng_cntl.f.dis_src_uses_dst_dirmaj = 1;
-+        fifoEntries += 4;
-+    }
-+
-+    W100ResetContext(w100c);
-+    W100SetRotation(w100c, randr, FALSE);
-+    W100SetSource(screen, srcPitch, srcOffset, bpp);
-+    W100SetDestination(screen, dstPitch, dstOffset, bpp);
-+    W100TrajectoryOrigin(w100c, dstBox, &dstX, &dstY);
-+
-+    src_x_y.f.src_x = srcBox->x1;
-+    src_x_y.f.src_y = srcBox->y1;
-+    dst_x_y.f.dst_x = dstX;
-+    dst_x_y.f.dst_y = dstY;
-+    src_width.f.src_width = srcBox->x2 - srcBox->x1 + 1;
-+    src_height.f.src_height = srcBox->y2 - srcBox->y1 + 1;
-+    dst_width_height.f.dst_height = dstBox->y2 - dstBox->y1 + 1;
-+    dst_width_height.f.dst_width_b0 = (dstBox->x2 - dstBox->x1 + 1) & 0xff;
-+    dst_width_height.f.dst_width_b1 = ((dstBox->x2 - dstBox->x1 + 1) >> 8) & 0x3f;
-+
-+    DBG_IMAGEON(("W100Blt src(x:%d,y:%d,w:%d,h:%d) dst(x:%d,y:%d,w:%d,h:%d)\n",
-+                 src_x_y.f.src_x,
-+                 src_x_y.f.src_y,
-+                 src_width.f.src_width,
-+                 src_height.f.src_height,
-+                 dst_x_y.f.dst_x,
-+                 dst_x_y.f.dst_y,
-+                 dst_width_height.f.dst_width_b0 |
-+                 dst_width_height.f.dst_width_b1 << 8,
-+                 dst_width_height.f.dst_height));
-+    
-+    if (W100WaitCmdFifoEntries(w100c, fifoEntries)) {
-+        MMIO_OUT32(mmDST_PITCH,   w100c->ctx.dst.pitch);
-+        MMIO_OUT32(mmDST_OFFSET,  w100c->ctx.dst.offset);
-+        MMIO_OUT32(mmSRC_PITCH,   w100c->ctx.src.pitch);
-+        MMIO_OUT32(mmSRC_OFFSET,  w100c->ctx.src.offset);    
-+        MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeCopyGmc(w100c, GXcopy));
-+        MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath);
-+        if (hasXForm) {
-+            MMIO_OUT32(mmENG_CNTL, eng_cntl.val);
-+            MMIO_OUT32(mmSRC_WIDTH,        src_width.val);
-+            MMIO_OUT32(mmSRC_HEIGHT,       src_height.val);
-+        }
-+        MMIO_OUT32(mmSRC_X_Y,          src_x_y.val);
-+        MMIO_OUT32(mmDST_X_Y,          dst_x_y.val);
-+        MMIO_OUT32(mmDST_WIDTH_HEIGHT, dst_width_height.val);
-+        /* Restore state */
-+        if (hasXForm) {
-+            MMIO_OUT32(mmENG_CNTL, w100c->regs.ENG_CNTL);
-+        }
-+    } else {
-+        ErrorF("Unable to perform Blitting\n");
-+    }
-+}
-+
-+static void W100StretchBlt(KdScreenInfo *screen, 
-+                           int randr,
-+                           int bpp,
-+                           CARD32 srcOffset,
-+                           CARD16 srcPitch,
-+                           BoxPtr srcBox,
-+                           CARD32 dstOffset,
-+                           CARD16 dstPitch,
-+                           BoxPtr dstBox,
-+                           CARD8 xscaler,
-+                           CARD8 yscaler)
-+{
-+    ScreenPtr pScreen = screen->pScreen;
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    Bool hasXForm = FALSE;
-+    dp_datatype_u dp_datatype;
-+    dp_mix_u dp_mix;
-+    eng_cntl_u eng_cntl;
-+    e2_arithmetic_cntl_u e2;
-+    src_inc_u src_inc;
-+    src_x_y_u src_x_y;
-+    dst_x_y_u dst_x_y;
-+    src_width_u src_width;
-+    src_height_u src_height;
-+    dst_width_height_u dst_width_height;
-+    int firstStage = 10;
-+    int secondStage = 10;
-+    CARD16 dx, dy, sw, sh, dw, dh;
-+    BoxRec dst;
-+
-+    DBG_IMAGEON(("W100StretchBlt(randr:%d,bpp:%d,"
-+                 "src(x1:%d,y1:%d,x2:%d,y2:%d,pitch:%d,offset:%d),"
-+                 "dst(x1:%d,y1:%d,x2:%d,y2:%d,pitch:%d,offset:%d),"
-+                 "xscaler:%d,yscaler:%d)\n",
-+                 randr, bpp,
-+                 srcBox->x1, srcBox->y1, srcBox->x2, srcBox->y2, 
-+                 srcPitch, srcOffset,
-+                 dstBox->x1, dstBox->y1, dstBox->x2, dstBox->y2, 
-+                 dstPitch, dstOffset,
-+                 xscaler, yscaler));
-+
-+    sw = W100ApplyScaler(srcBox->x2 - srcBox->x1 + 1, xscaler);
-+    sh = W100ApplyScaler(srcBox->y2 - srcBox->y1 + 1, yscaler);
-+
-+    if (randr & (RR_Rotate_90|RR_Rotate_270)) {
-+        hasXForm = TRUE;
-+        eng_cntl.val = w100c->regs.ENG_CNTL;
-+        eng_cntl.f.dis_rop_src_uses_dst_w_h = 1;
-+        eng_cntl.f.dis_src_uses_dst_dirmaj = 1;
-+        ++firstStage;
-+        ++secondStage;
-+        dh = sw;
-+        dw = sh;
-+    } else {
-+        dh = sh;
-+        dw = sw;
-+    }
-+
-+    dst.x1 = dstBox->x1;
-+    dst.y1 = dstBox->y1;
-+    dst.x2 = dst.x1 + dw - 1;
-+    dst.y2 = dst.y1 + dh - 1;
-+
-+    W100ResetContext(w100c);
-+    W100SetRotation(w100c, randr, FALSE);
-+    W100SetSource(screen, srcPitch, srcOffset, bpp);
-+    W100SetDestination(screen, dstPitch, dstOffset, bpp);
-+    W100TrajectoryOrigin(w100c, &dst, &dx, &dy);
-+
-+    src_inc.val = 0;
-+    src_inc.f.src_xinc = xscaler;
-+    src_inc.f.src_yinc = yscaler;
-+
-+    dp_datatype.val = 0;
-+    dp_datatype.f.dp_brush_datatype = DP_BRUSH_SOLIDCOLOR;
-+    dp_datatype.f.dp_dst_datatype   = w100c->ctx.dst.datatype;
-+    dp_datatype.f.dp_src_datatype   = w100c->ctx.src.datatype;
-+    dp_datatype.f.dp_byte_pix_order = DP_PIX_ORDER_LSB2MSB;
-+
-+    dp_mix.val = 0;
-+    dp_mix.f.dp_op          = DP_OP_ARITHMETIC;
-+    dp_mix.f.dp_src_source  = DP_SRC_MEM_RECTANGULAR;
-+    dp_mix.f.dp_rop3        = W100BltRop[GXcopy];
-+    
-+    e2.val = 0;
-+    e2.f.opcode   = E2_OPC_STRETCH_SRC2;
-+    e2.f.srcblend = E2_SRCBLEND_ZERO;
-+    e2.f.dstblend = E2_DSTBLEND_ZERO;
-+
-+    src_x_y.f.src_x = srcBox->x1;
-+    src_x_y.f.src_y = srcBox->y1;
-+    dst_x_y.f.dst_x = dx;
-+    dst_x_y.f.dst_y = dy;
-+    src_width.f.src_width = sw + 1;
-+    src_height.f.src_height = sh;
-+    dst_width_height.f.dst_height = dh;
-+    dst_width_height.f.dst_width_b0 = dw & 0xff;
-+    dst_width_height.f.dst_width_b1 = (dw >> 8) & 0x3f;
-+
-+
-+    if (W100WaitCmdFifoEntries(w100c, firstStage)) {
-+        /* Set Source */
-+        MMIO_OUT32(mmSRC_PITCH,   w100c->ctx.src.pitch);
-+        MMIO_OUT32(mmSRC_OFFSET,  w100c->ctx.src.offset);
-+
-+        /* Set Destination */
-+        MMIO_OUT32(mmDST_PITCH,   w100c->ctx.dst.pitch);
-+        MMIO_OUT32(mmDST_OFFSET,  w100c->ctx.dst.offset);
-+
-+        /* Prepare for Stretch Operation */
-+        MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeAritGmc(w100c, GXcopy));
-+        MMIO_OUT32(mmDP_DATATYPE,        dp_datatype.val);
-+        MMIO_OUT32(mmDP_MIX,             dp_mix.val);
-+        MMIO_OUT32(mmE2_ARITHMETIC_CNTL, e2.val);
-+
-+        /* Set Data Trajectory */
-+        if (hasXForm) {
-+            MMIO_OUT32(mmENG_CNTL, eng_cntl.val);
-+        }
-+        MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath);
-+    } else {
-+        ErrorF("Error preparing for Stretch operation\n");
-+        return;
-+    }
-+
-+    if (W100WaitCmdFifoEntries(w100c, secondStage)) {
-+        /* Perform blitting */
-+        MMIO_OUT32(mmSRC_X_Y,          src_x_y.val);
-+        MMIO_OUT32(mmDST_X_Y,          dst_x_y.val);
-+        MMIO_OUT32(mmSRC_WIDTH,        src_width.val);
-+        MMIO_OUT32(mmSRC_HEIGHT,       src_height.val);
-+        MMIO_OUT32(mmSRC_INC,          src_inc.val);
-+        MMIO_OUT32(mmDST_WIDTH_HEIGHT, dst_width_height.val);
-+        /* Restore state */
-+        if (hasXForm) {
-+            MMIO_OUT32(mmENG_CNTL, w100c->regs.ENG_CNTL);
-+        }
-+    } else {
-+        ErrorF("Error performing Stretch operation\n");
-+    }
-+}
-+
-+static void W100ScaledBlt(KdScreenInfo *screen, 
-+                          int randr,
-+                          int bpp,
-+                          CARD32 srcOffset,
-+                          CARD16 srcPitch,
-+                          BoxPtr srcBox,
-+                          CARD32 dstOffset,
-+                          CARD16 dstPitch,
-+                          BoxPtr dstBox,
-+                          CARD8 xscaler,
-+                          CARD8 yscaler)
-+{
-+    ScreenPtr pScreen = screen->pScreen;
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    Bool hasXForm = FALSE;
-+    dp_datatype_u dp_datatype;
-+    dp_mix_u dp_mix;
-+    eng_cntl_u eng_cntl;
-+    e2_arithmetic_cntl_u e2;
-+    src_inc_u src_inc;
-+    src_x_y_u src_x_y;
-+    src2_x_y_u src2_x_y;
-+    dst_x_y_u dst_x_y;
-+    src_width_u src_width;
-+    src_height_u src_height;
-+    dst_width_height_u dst_width_height;
-+    int firstStage = 11;
-+    int secondStage = 11;
-+    CARD16 dx, dy, sw, sh, dw, dh;
-+    BoxRec dst;
-+
-+    DBG_IMAGEON(("W100ScaledBlt(randr:%d,bpp:%d,"
-+                 "src(x1:%d,y1:%d,x2:%d,y2:%d,pitch:%d,offset:%d),"
-+                 "dst(x1:%d,y1:%d,x2:%d,y2:%d,pitch:%d,offset:%d),"
-+                 "xscaler:%d,yscaler:%d)\n",
-+                 randr, bpp,
-+                 srcBox->x1, srcBox->y1, srcBox->x2, srcBox->y2, 
-+                 srcPitch, srcOffset,
-+                 dstBox->x1, dstBox->y1, dstBox->x2, dstBox->y2, 
-+                 dstPitch, dstOffset,
-+                 xscaler, yscaler));
-+
-+    sw = W100ApplyScaler(srcBox->x2 - srcBox->x1 + 1, xscaler);
-+    sh = W100ApplyScaler(srcBox->y2 - srcBox->y1 + 1, yscaler);
-+    
-+    if (randr & (RR_Rotate_90|RR_Rotate_270)) {
-+        hasXForm = TRUE;
-+        eng_cntl.val = w100c->regs.ENG_CNTL;
-+        eng_cntl.f.dis_rop_src_uses_dst_w_h = 1;
-+        eng_cntl.f.dis_src_uses_dst_dirmaj = 1;
-+        ++firstStage;
-+        ++secondStage;
-+        dh = sw;
-+        dw = sh;
-+    } else {
-+        dh = sh;
-+        dw = sw;
-+    }
-+
-+    dst.x1 = dstBox->x1;
-+    dst.y1 = dstBox->y1;
-+    dst.x2 = dst.x1 + dw - 1;
-+    dst.y2 = dst.y1 + dh - 1;
-+
-+    W100ResetContext(w100c);
-+    W100SetRotation(w100c, randr, FALSE);
-+    W100SetSource(screen, srcPitch, srcOffset, bpp);
-+    W100SetDestination(screen, dstPitch, dstOffset, bpp);
-+    W100TrajectoryOrigin(w100c, &dst, &dx, &dy);
-+
-+    DBG_IMAGEON(("Corrected dst(x1:%d,y1:%d,x2:%d,y2:%d). Origin(%d,%d)\n",
-+                 dst.x1, dst.y1, dst.x2, dst.y2,
-+                 dx, dy));
-+
-+    src_inc.val = 0;
-+    src_inc.f.src_xinc = xscaler;
-+    src_inc.f.src_yinc = yscaler;
-+
-+    dp_datatype.val = 0;
-+    dp_datatype.f.dp_brush_datatype = DP_BRUSH_SOLIDCOLOR;
-+    dp_datatype.f.dp_src2_type      = 1;
-+    dp_datatype.f.dp_dst_datatype   = w100c->ctx.dst.datatype;
-+    dp_datatype.f.dp_src2_datatype  = w100c->ctx.src.datatype;
-+    dp_datatype.f.dp_src_datatype   = w100c->ctx.src.datatype;
-+    dp_datatype.f.dp_byte_pix_order = DP_PIX_ORDER_LSB2MSB;
-+
-+    dp_mix.val = 0;
-+    dp_mix.f.dp_op          = DP_OP_ARITHMETIC;
-+    dp_mix.f.dp_src_source  = DP_SRC_MEM_RECTANGULAR;
-+    dp_mix.f.dp_src2_source = DP_SRC_MEM_RECTANGULAR;
-+    dp_mix.f.dp_rop3        = W100BltRop[GXcopy];
-+    
-+    e2.val = 0;
-+    e2.f.opcode   = E2_OPC_SCALE_SRC2;
-+    e2.f.srcblend = E2_SRCBLEND_ZERO;
-+    e2.f.dstblend = E2_DSTBLEND_ZERO;
-+
-+
-+    src_x_y.f.src_x = srcBox->x1;
-+    src_x_y.f.src_y = srcBox->y1;
-+    src2_x_y.f.src_x = srcBox->x1;
-+    src2_x_y.f.src_y = srcBox->y1 + 4;
-+    dst_x_y.f.dst_x = dx;
-+    dst_x_y.f.dst_y = dy;
-+    src_width.f.src_width = sw + 1;
-+    src_height.f.src_height = sh;
-+    dst_width_height.f.dst_height = dh;
-+    dst_width_height.f.dst_width_b0 = dw & 0xff;
-+    dst_width_height.f.dst_width_b1 = (dw >> 8) & 0x3f;
-+
-+    if (W100WaitCmdFifoEntries(w100c, firstStage)) {
-+        /* Set Source */
-+        MMIO_OUT32(mmSRC_PITCH,   w100c->ctx.src.pitch);
-+        MMIO_OUT32(mmSRC_OFFSET,  w100c->ctx.src.offset);    
-+
-+        /* Set Destination */
-+        MMIO_OUT32(mmDST_PITCH,   w100c->ctx.dst.pitch);
-+        MMIO_OUT32(mmDST_OFFSET,  w100c->ctx.dst.offset);
-+        /* Set second source */
-+        MMIO_OUT32(mmSRC2_PITCH,  w100c->ctx.src.pitch);
-+        MMIO_OUT32(mmSRC2_OFFSET, w100c->ctx.src.offset);
-+
-+        /* Prepare for Stretch Operation */
-+        MMIO_OUT32(mmDP_GUI_MASTER_CNTL, W100ComputeAritGmc(w100c, GXcopy));
-+        MMIO_OUT32(mmDP_DATATYPE,        dp_datatype.val);
-+        MMIO_OUT32(mmDP_MIX,             dp_mix.val);
-+        MMIO_OUT32(mmE2_ARITHMETIC_CNTL, e2.val);
-+        /* Set Data Trajectory */
-+        if (hasXForm) {
-+            MMIO_OUT32(mmENG_CNTL, eng_cntl.val);
-+        }
-+        MMIO_OUT32(mmDP_CNTL, w100c->ctx.xform.dataPath);
-+    } else {
-+        ErrorF("Unable to prepare for Scaled Blitting\n");
-+        return;
-+    }
-+    if (W100WaitCmdFifoEntries(w100c, secondStage)) {
-+        /* Perform blitting */
-+        MMIO_OUT32(mmSRC_X_Y,          src_x_y.val);
-+        MMIO_OUT32(mmSRC2_X_Y,         src2_x_y.val);
-+        MMIO_OUT32(mmSRC2_WIDTH,       src_width.val);
-+        MMIO_OUT32(mmSRC2_HEIGHT,      src_height.val);
-+        MMIO_OUT32(mmSRC_INC,          src_inc.val);
-+        MMIO_OUT32(mmSRC2_INC,         src_inc.val);
-+        MMIO_OUT32(mmDST_X_Y,          dst_x_y.val);
-+        MMIO_OUT32(mmSRC_WIDTH,        src_width.val);
-+        MMIO_OUT32(mmSRC_HEIGHT,       src_height.val);
-+        MMIO_OUT32(mmDST_WIDTH_HEIGHT, dst_width_height.val);
-+        /* Restore state */
-+        if (hasXForm) {
-+            MMIO_OUT32(mmENG_CNTL, w100c->regs.ENG_CNTL);
-+        }
-+        /* Without this, solid blitting is no longer working correctly */
-+        dp_datatype.f.dp_src2_type = 0;
-+        MMIO_OUT32(mmDP_DATATYPE, dp_datatype.val);
-+    } else {
-+        ErrorF("Unable to perform Scaled Blitting\n");
-+    }
-+}
-+
-+void W100PlanarBlt(KdScreenInfo *screen,
-+                   int planes, int planeOffsets[],
-+                   int bpp, int randr,
-+                   KdOffscreenArea *src,
-+                   int srcW,
-+                   int srcH,
-+                   BoxPtr srcBox,
-+                   KdOffscreenArea *dst,
-+                   int dstW,
-+                   int dstH,
-+                   BoxPtr dstBox)
-+{
-+    ScreenPtr pScreen = screen->pScreen;
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+
-+    CARD16 dstBoxW, dstBoxH, srcBoxW, srcBoxH;
-+    CARD8 *srcOffset, *dstBase, *dstOffset;
-+    int xerror, yerror;
-+    unsigned int subsampling[] = {0, 1, 1};
-+    int plane;
-+    srcBoxW = srcBox->x2 - srcBox->x1 + 1;
-+    srcBoxH = srcBox->y2 - srcBox->y1 + 1;
-+    if (randr & (RR_Rotate_90 | RR_Rotate_270)) {
-+        dstBoxW = dstBox->y2 - dstBox->y1 + 1;
-+        dstBoxH = dstBox->x2 - dstBox->x1 + 1;
-+    } else {
-+        dstBoxW = dstBox->x2 - dstBox->x1 + 1;
-+        dstBoxH = dstBox->y2 - dstBox->y1 + 1;
-+    }
-+
-+    Bool stretch = ((srcBoxW != dstBoxW) || (srcBoxH != dstBoxH));
-+    CARD8 xscaler, yscaler;
-+    BoxRec dstb = *dstBox;
-+
-+    DBG_IMAGEON(("W100PlanarBlt(planes:%d,bpp:%d,randr:%d,"
-+                 "src(x1:%d,y1:%d,x2:%d,y2:%d,w:%d,h:%d),"
-+                 "dst(x1:%d,y1:%d,x2:%d,y2:%d,w:%d,h:%d)\n",
-+                 planes, bpp, randr,
-+                 srcBox->x1, srcBox->y1, srcBox->x2, srcBox->y2, srcW, srcH,
-+                 dstBox->x1, dstBox->y1, dstBox->x2, dstBox->y2, dstW, dstH));
-+
-+    xerror = yerror = 0;
-+    if (stretch) {
-+        xscaler = W100GetScaler(dstBoxW, srcBoxW);
-+        yscaler = W100GetScaler(dstBoxH, srcBoxH);
-+        if (xscaler != 16 || yscaler != 16) {
-+            xerror = (dstBoxW - W100ApplyScaler(srcBoxW, xscaler)) / 2;
-+            yerror = (dstBoxH - W100ApplyScaler(srcBoxH, yscaler)) / 2;
-+            DBG_IMAGEON(("Stretching with xscaler:%d,yscaler:%d,"
-+                         "xerror:%d,yerror:%d\n", 
-+                         xscaler, yscaler, xerror, yerror));
-+        } else {
-+            xerror = yerror = 0;
-+            stretch = FALSE;
-+        }
-+    }
-+
-+    W100MoveTo(&dstb, xerror, yerror);
-+
-+    srcOffset = src->vidmem->base + src->offset;
-+    dstBase = dst->vidmem->base + dst->offset;
-+    for (plane = 0; plane < planes; plane++) {
-+        BoxRec srcCBox;
-+        BoxRec dstCBox;
-+        dstOffset = dstBase + planeOffsets[plane];
-+        W100ScaleBox(srcBox, &srcCBox, -subsampling[plane]);
-+        W100ScaleBox(&dstb, &dstCBox, -subsampling[plane]);
-+        if (stretch) {
-+            W100ScaledBlt(screen, randr, bpp,
-+                          (CARD32) srcOffset,
-+                          srcW           >> subsampling[plane],
-+                          &srcCBox,
-+                          (CARD32) dstOffset,
-+                          dstW           >> subsampling[plane],
-+                          &dstCBox,
-+                          xscaler, yscaler);
-+        } else {
-+            W100Blt(screen, randr, bpp,
-+                    (CARD32) srcOffset,
-+                    srcW     >> subsampling[plane],
-+                    &srcCBox,
-+                    (CARD32) dstOffset,
-+                    dstW     >> subsampling[plane],
-+                    &dstCBox);
-+        }
-+        srcOffset += (srcW * srcH) >> (subsampling[plane] * 2);
-+    }
-+}
-+
-+void W100SetBrightness(W100CardInfo *w100c, CARD8 value)
-+{
-+    brightness_cntl_u brightness;
-+    brightness.val = 0;
-+    brightness.f.brightness = value;
-+    MMIO_OUT32(mmBRIGHTNESS_CNTL, brightness.val);
-+}
-+
-+CARD8 W100GetBrightness(W100CardInfo *w100c)
-+{
-+    brightness_cntl_u brightness;
-+    brightness.val = MMIO_IN32(mmBRIGHTNESS_CNTL);
-+    return brightness.f.brightness;
-+}
-+
-+int W100GetRotation(W100CardInfo *w100c)
-+{
-+    graphic_ctrl_u gc;
-+    int randr;
-+
-+    gc.val = MMIO_IN32(mmGRAPHIC_CTRL);
-+
-+    switch (gc.f.portrait_mode) {
-+    case 0:
-+        randr = RR_Rotate_0;
-+        break;
-+    case 1:
-+        randr = RR_Rotate_90;
-+        break;
-+    case 2:
-+        randr = RR_Rotate_270;
-+        break;
-+    case 3:
-+        randr = RR_Rotate_180;
-+        break;
-+    }
-+    return randr;
-+}
-+
-+Bool W100SysFsSet(W100CardInfo *w100c, const char *path, const char *value)
-+{
-+    FILE *fd;
-+    if ((fd = fopen(path, "w")) == NULL) {
-+        ErrorF("(E) Error in W100SysFsSet: Unable to open '%s'\n", path);
-+        return FALSE;
-+    }
-+    fprintf(fd, "%s", value);
-+    fclose(fd);
-+    return TRUE;
-+}
-+
-+Bool W100SysFsGet(W100CardInfo *w100c, const char *path, char *value)
-+{
-+    FILE *fd;
-+    if ((fd = fopen(path, "r")) == NULL) {
-+        ErrorF("(E) Error in W100SysFsGet: Unable to open '%s'\n", path);
-+        return FALSE;
-+    }
-+    fscanf(fd, "%s", value);
-+    fclose(fd);
-+    return TRUE;
-+}
-+
-+void W100TransformTsLibCoordinates(long *x, long *y, void *closure)
-+{
-+    W100CardInfo *w100c = closure;
-+
-+    if (w100c->hw_window.mode->width == 320) {
-+        *x >>= 1;
-+        *y >>= 1;
-+    }
-+}
-+  
-+void W100VSync(W100CardInfo *w100c)
-+{
-+    int timeout = 30000;  /* VSync timeout = 30[ms] > 16.8[ms] */
-+    active_v_disp_u active_v_disp;
-+    disp_int_cntl_u disp_int_cntl;
-+    gen_int_cntl_u gen_int_cntl;
-+    gen_int_status_wr_u gen_int_status;
-+
-+    active_v_disp.val = MMIO_IN32(mmACTIVE_V_DISP);
-+
-+    /*set vline pos */
-+    disp_int_cntl.val = 0;
-+    disp_int_cntl.f.vline_int_pos = active_v_disp.f.active_v_end;
-+    MMIO_OUT32(mmDISP_INT_CNTL, disp_int_cntl.val);
-+
-+    /* disable vline irq */
-+    gen_int_cntl.val = MMIO_IN32(mmGEN_INT_CNTL);
-+    gen_int_cntl.f.crtc_vline_mask = 0;
-+    MMIO_OUT32(mmGEN_INT_CNTL, gen_int_cntl.val);
-+
-+    /* clear vline irq status */
-+    gen_int_status.val = 0;
-+    gen_int_status.f.crtc_vline_stat_ak = 1;
-+    MMIO_OUT32(mmGEN_INT_STATUS, gen_int_status.val);
-+
-+    /* enable vline irq */
-+    gen_int_cntl.f.crtc_vline_mask = 1;
-+    MMIO_OUT32(gen_int_cntl.val, mmGEN_INT_CNTL);
-+
-+    /* clear vline irq status */
-+    MMIO_OUT32(mmGEN_INT_STATUS, gen_int_status.val);
-+
-+    while (timeout > 0) {
-+        if (MMIO_IN32(mmGEN_INT_STATUS) & 0x00000002) {
-+            break;
-+        }
-+        usleep(1);
-+        timeout--;
-+    }
-+
-+    /* disable vline irq */
-+    gen_int_cntl.f.crtc_vline_mask = 0;
-+    MMIO_OUT32(mmGEN_INT_CNTL, gen_int_cntl.val);
-+
-+    /* clear vline irq status */
-+    MMIO_OUT32(mmGEN_INT_STATUS, gen_int_status.val);
-+}
-+      
-+        
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_video.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_video.c	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,1172 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <kdrive-config.h>
-+#endif
-+#include "imageon.h"
-+#include "imageon_regs.h"
-+#include "imageon_support.h"
-+#include "imageon_const.h"
-+#include "kaa.h"
-+
-+#include <X11/extensions/Xv.h>
-+#include "fourcc.h"
-+
-+static Atom xvBrightness;
-+static Atom xvMaxOverlaySize;
-+static Atom xvColorKey;
-+
-+#define IMAGE_MAX_WIDTH  720
-+#define IMAGE_MAX_HEIGHT 576
-+
-+#define W_ALIGN 0
-+#define H_ALIGN 0
-+
-+#define OVL_W_ALIGN 16
-+#define OVL_H_ALIGN 16
-+
-+#define OVL_MAX_SIZE 196608
-+
-+static KdVideoEncodingRec DummyEncoding[1] = {
-+    {0, "XV_IMAGE", IMAGE_MAX_WIDTH, IMAGE_MAX_HEIGHT, {1, 1}}
-+};
-+
-+#define NUM_IMAGES    (4)
-+static KdImageRec Images[NUM_IMAGES] = {
-+    XVIMAGE_YUY2,
-+    XVIMAGE_YV12,
-+    XVIMAGE_I420,
-+    XVIMAGE_UYVY
-+};
-+
-+#define NUM_FORMATS    (3)
-+static KdVideoFormatRec Formats[NUM_FORMATS] = {
-+    {15, TrueColor},
-+    {16, TrueColor},
-+    {24, TrueColor}
-+};
-+
-+#define NUM_ATTRIBUTES (3)
-+static KdAttributeRec Attributes[NUM_ATTRIBUTES] = {
-+    {XvSettable | XvGettable, 0,    (1 << 16) - 1, "XV_COLORKEY"},
-+    {XvSettable | XvGettable, 0,    127,           "XV_BRIGHTNESS"},
-+    {XvSettable | XvGettable, 0,    392960,        "XV_MAXOVERLAYSIZE"}
-+};
-+    
-+#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
-+
-+#define NUM_OVL_RESIZERS (10)
-+static struct {
-+    CARD8 xfactor;
-+    CARD8 yfactor;
-+} ovlResizers[NUM_OVL_RESIZERS] = {
-+    { 0, 0 }, 
-+    { 0, 1 }, { 1, 0 }, { 1, 1 }, 
-+    { 1, 2 }, { 2, 1 }, { 2, 2 }, 
-+    { 2, 3 }, { 3, 2 }, { 3, 3 }
-+};
-+
-+static int W100SurfaceSize(W100PortPrivPtr port, short w, short h)
-+{
-+    int size = 0;
-+    DBG_IMAGEON(("W100SurfaceSize for id=%08x, w=%d, h=%d\n", 
-+                 port->src.id, w, h));
-+
-+    switch (port->src.id) {
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        size = (3 * w * h) / 2;
-+        break;
-+    case FOURCC_UYVY:
-+    case FOURCC_YUY2:
-+        size = w * h * 2;
-+        break;
-+    }
-+    return size;
-+}
-+
-+static void W100ClearSurface(KdScreenInfo *screen, 
-+                             KdOffscreenArea *area,
-+                             CARD16 x,
-+                             CARD16 y,
-+                             CARD16 pitch,
-+                             CARD16 width,
-+                             CARD16 height,
-+                             int id)
-+{
-+    W100CardInfo(screen);
-+    int nplanes;
-+    unsigned int subsampling[] = {0, 1, 1};
-+    unsigned int zero[] = {0, 0x80, 0x80};
-+    int bpp;
-+    int plane;
-+    CARD8 *dstOffset = area->vidmem->base + area->offset;
-+
-+    switch (id) {
-+    case FOURCC_UYVY:
-+    case FOURCC_YUY2:
-+        nplanes = 1;
-+        bpp = 16;
-+        break;
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        nplanes = 3;
-+        bpp = 8;
-+    }
-+
-+    DBG_IMAGEON(("Clearing surface with planes:%d, bpp:%d, pitch:%d, height:%d\n",
-+                 nplanes, bpp, pitch, height));
-+
-+    W100ResetContext(w100c);
-+    for (plane = 0; plane < nplanes; plane++) {
-+        W100SetDestination(screen,
-+                           pitch >> subsampling[plane], 
-+                           (CARD32) dstOffset, 
-+                           bpp);
-+        if (W100WaitCmdFifoEntries(w100c, 6)) {
-+            MMIO_OUT32(mmDST_PITCH, w100c->ctx.dst.pitch);
-+            MMIO_OUT32(mmDST_OFFSET, w100c->ctx.dst.offset);
-+            MMIO_OUT32(mmDP_GUI_MASTER_CNTL, 
-+                       W100ComputeSolidGmc(w100c, GXcopy));
-+            MMIO_OUT32(mmDP_BRUSH_FRGD_CLR, zero[plane]);
-+            MMIO_OUT32(mmDST_Y_X, 0);
-+            MMIO_OUT32(mmDST_HEIGHT_WIDTH, (height << 16) | width);
-+        } else {
-+            ErrorF("Error clearing surface\n");
-+            break;
-+        }
-+        dstOffset += (pitch * height) >> (subsampling[plane] * 2);
-+    }
-+}
-+
-+static void W100OverlaySetup(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+    CARD16 w, h, pitch;
-+    video_ctrl_u     video_ctrl;
-+    video_y_offset_u video_y_offset;
-+    video_y_pitch_u  video_y_pitch;
-+    video_u_offset_u video_u_offset;
-+    video_u_pitch_u  video_u_pitch;
-+    video_v_offset_u video_v_offset;
-+    video_v_pitch_u  video_v_pitch;
-+    graphic_key_u    graphic_key;
-+    video_h_pos_u    video_hpos;
-+    video_v_pos_u    video_vpos;
-+    graphic_h_disp_u graphic_h_disp;
-+    graphic_v_disp_u graphic_v_disp;
-+
-+    w = pitch = port->ovl.frame.x2 - port->ovl.frame.x1 + 1;
-+    h = port->ovl.frame.y2 - port->ovl.frame.y1 + 1;
-+
-+    ErrorF("W100OverlaySetup(ovlX:%d,ovlY:%d,ovlWidth:%d,ovlHeight:%d,"
-+           "videoHorExp:%d,videoVerExp:%d,YPlane:0x%08x,UPlane:0x%08x,"
-+           "VPlane:0x%08x)\n",
-+           port->ovl.frame.x1, port->ovl.frame.y1, w, h,
-+           port->ovl.horExp, 
-+           port->ovl.verExp,
-+           port->planes.yplane, 
-+           port->planes.uplane,
-+           port->planes.vplane);
-+
-+    if (port->videoStatus & W100_OVERLAY_CONFIGURED) {
-+        return;
-+    }
-+
-+    w <<= port->ovl.horExp;
-+    h <<= port->ovl.verExp;
-+
-+    video_ctrl.val = w100c->regs.VIDEO_CTRL;
-+
-+    video_ctrl.f.video_inv_hor = 0;
-+    video_ctrl.f.video_inv_ver = 0;
-+    video_ctrl.f.yuv2rgb_option = 0;
-+    video_ctrl.f.video_hor_exp = port->ovl.horExp;
-+    video_ctrl.f.video_ver_exp = port->ovl.verExp;
-+    video_ctrl.f.video_ch_sel = 0;
-+
-+    video_ctrl.f.yuv2rgb_en = 1;
-+    //Only support this, by the moment
-+    video_ctrl.f.video_mode = OVLFORMAT_YUV420;
-+
-+
-+    video_y_pitch.val = 0;
-+    video_u_pitch.val = 0;
-+    video_v_pitch.val = 0;
-+    video_y_pitch.f.y_pitch = pitch;
-+    video_u_pitch.f.u_pitch = pitch >> 1;
-+    video_v_pitch.f.v_pitch = pitch >> 1;
-+
-+    video_y_offset.val = 0;
-+    video_u_offset.val = 0;
-+    video_v_offset.val = 0;
-+    video_y_offset.f.y_offset = port->planes.yplane;
-+    video_u_offset.f.u_offset = port->planes.uplane;
-+    video_v_offset.f.v_offset = port->planes.vplane;
-+
-+    graphic_key.val = 0;
-+    graphic_key.f.keyer_color = port->ovl.colorKey;
-+    graphic_key.f.keyer_mask  = 0xffffUL;
-+    video_ctrl.f.keyer_en = 1;
-+
-+    graphic_h_disp.val = w100c->regs.GRAPHIC_H_DISP;
-+    graphic_v_disp.val = w100c->regs.GRAPHIC_V_DISP;
-+
-+    video_hpos.f.video_h_start = graphic_h_disp.f.graphic_h_start 
-+        + port->ovl.frame.x1;
-+    video_hpos.f.video_h_end = video_hpos.f.video_h_start + w;
-+
-+    video_vpos.f.video_v_start = graphic_v_disp.f.graphic_v_start 
-+        + port->ovl.frame.y1;
-+    video_vpos.f.video_v_end = video_vpos.f.video_v_start + h;
-+    if (video_hpos.f.video_h_end > graphic_h_disp.f.graphic_h_end) {
-+        w = graphic_h_disp.f.graphic_h_end - video_hpos.f.video_h_start;
-+    }
-+
-+    //This is possibly not valid for non planar modes
-+    video_ctrl.f.total_req_video = (w + 3) / 4;
-+
-+    W100DisableDisplayUpdate(w100c);
-+    //This need to be tuned deeply, to get an stable
-+    //overlay image:
-+    //Best results seems to be present with 0x40xxxxxx
-+    //But overlay surface must be located in a 8 dot multiple
-+    MMIO_OUT32(mmDISP_DEBUG2, 
-+               (w100c->regs.DISP_DEBUG2 & ~0xff000000) | 0x40000000 );
-+    MMIO_OUT32(mmGRAPHIC_KEY, graphic_key.val);
-+    MMIO_OUT32(mmVIDEO_Y_OFFSET, video_y_offset.val);
-+    MMIO_OUT32(mmVIDEO_Y_PITCH, video_y_pitch.val);
-+    MMIO_OUT32(mmVIDEO_U_OFFSET, video_u_offset.val);
-+    MMIO_OUT32(mmVIDEO_U_PITCH, video_u_pitch.val);
-+    MMIO_OUT32(mmVIDEO_V_OFFSET, video_v_offset.val);
-+    MMIO_OUT32(mmVIDEO_V_PITCH, video_v_pitch.val);
-+    MMIO_OUT32(mmVIDEO_CTRL, video_ctrl.val);
-+    MMIO_OUT32(mmVIDEO_H_POS, video_hpos.val);
-+    MMIO_OUT32(mmVIDEO_V_POS, video_vpos.val);
-+    W100EnableDisplayUpdate(w100c);
-+
-+    port->videoCtrl = video_ctrl.val;
-+    port->videoStatus |= W100_OVERLAY_CONFIGURED;
-+}
-+
-+static void W100OverlayEnable(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+    video_ctrl_u video_ctrl;
-+
-+    if (!(port->videoStatus & W100_OVERLAY_CONFIGURED)) {
-+        W100OverlaySetup(screen);
-+    }
-+
-+    if (!(port->videoStatus & W100_OVERLAY_ON)) {
-+        ErrorF("W100OverlayEnable()\n");
-+        video_ctrl.val = port->videoCtrl;
-+        video_ctrl.f.en_video_req = 1;
-+        video_ctrl.f.en_video_crtc = 1;
-+        video_ctrl.f.en_graphic_req_video = 1;
-+        W100DisableDisplayUpdate(w100c);
-+        MMIO_OUT32(mmVIDEO_CTRL, video_ctrl.val);
-+        W100EnableDisplayUpdate(w100c);
-+        port->videoCtrl = video_ctrl.val;
-+        port->videoStatus |= W100_OVERLAY_ON;
-+    }
-+}
-+
-+static void W100OverlayDisable(KdScreenInfo *screen)
-+{
-+
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+
-+    video_ctrl_u video_ctrl;
-+
-+    if ((port->videoStatus & W100_OVERLAY_ON)) {
-+        ErrorF("W100OverlayDisable()\n");
-+        video_ctrl.val = port->videoCtrl;
-+        video_ctrl.f.en_video_req = 0;
-+        video_ctrl.f.en_video_crtc = 0;
-+        video_ctrl.f.en_graphic_req_video = 0;
-+        W100DisableDisplayUpdate(w100c);
-+        MMIO_OUT32(mmVIDEO_CTRL, video_ctrl.val);
-+        W100EnableDisplayUpdate(w100c);
-+        port->videoCtrl = video_ctrl.val;
-+        port->videoStatus &= ~W100_OVERLAY_ON;
-+    }
-+}
-+
-+static void W100VideoSave(ScreenPtr pScreen, KdOffscreenArea *area)
-+{
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+
-+    if (port->src.surface == area) {
-+        port->src.surface = NULL;
-+    }
-+
-+    if (port->ovl.surface == area) {
-+        port->ovl.surface = NULL;
-+    }
-+}
-+
-+static void W100SaveSurface(CARD8 *src, int size, const char *file)
-+{
-+    int fd;
-+    if (fd = open(file, O_WRONLY | O_CREAT | O_TRUNC,
-+                  S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) {
-+        write(fd, (void*) src, size);
-+        close(fd);
-+    }
-+}
-+    
-+static void W100HostPlanarData(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+    KdOffscreenArea *dst = port->src.surface;
-+    CARD8 *src = port->src.buffer;
-+    CARD16 srcPitch = port->src.width; //WARN: padding?
-+    CARD16 srcHeight = port->src.height;
-+    CARD16 dstPitch = port->src.box.x2 - port->src.box.x1 + 1; //WARN: padding?
-+    CARD16 dstHeight = port->src.box.y2 - port->src.box.y1 + 1;
-+    CARD16 srcX = port->src.box.x1;
-+    CARD16 srcY = port->src.box.y1;
-+    CARD16 dstX = 0;
-+    CARD16 dstY = 0;
-+    CARD16 w = dstPitch;
-+    CARD16 h = dstHeight;
-+    CARD8 *dstBase = dst->vidmem->base + dst->offset;
-+    CARD8 *dstPtr;
-+    CARD8 *srcPtr;
-+    int i;
-+
-+    srcPtr = src + (srcY * srcPitch) + srcX;
-+    dstPtr = dstBase + (dstY * dstPitch) + dstX;
-+
-+    DBG_IMAGEON(("W100HostPlanarData(src(pitch:%d,offset:0x%08x,x:%d,y:%d),"
-+                 "dst(pitch:%d,offset:0x%08x,x:%d,y:%d), w:%d,h:%d)\n",
-+                 srcPitch, srcPtr, srcX, srcY,
-+                 dstPitch, dstPtr, dstX, dstY,
-+                 w, h));
-+
-+    /* Copy Y plane */
-+    for (i = 0; i < h; i++) {
-+        memcpy(dstPtr, srcPtr, w);
-+        dstPtr += dstPitch;
-+        srcPtr += srcPitch;
-+    }
-+    /* Copy U plane */
-+    dstPtr = dstBase + (dstHeight * dstPitch) //Start of U Plane
-+        + (dstX >> 1)                         //X Offset
-+        + ((dstY * dstPitch) >> 2);           //Y Offset
-+    if (port->src.id == FOURCC_I420) {
-+        srcPtr = src + (srcHeight * srcPitch) //Start of U Plane
-+            + (srcX >> 1)                     //X Offset
-+            + ((srcY * srcPitch) >> 2);       //Y Offset
-+    } else {
-+        srcPtr = src + ((5 * srcHeight * srcPitch) / 4) //Start of U Plane
-+            + (srcX >> 1)                               //X Offset
-+            + ((srcY * srcPitch) >> 2);                 //Y Offset
-+    }
-+    for (i = 0; i < (h >> 1); i++) {
-+        memcpy(dstPtr, srcPtr, w >> 1);  //U Plane scanline
-+        srcPtr += srcPitch >> 1;
-+        dstPtr += dstPitch >> 1;
-+    }
-+
-+    /* Copy V plane */
-+    dstPtr = dstBase + ((5 * dstHeight * dstPitch) / 4) //Start of V Plane
-+        + (dstX >> 1)                         //X Offset
-+        + ((dstY * dstPitch) >> 2);           //Y Offset
-+    if (port->src.id == FOURCC_I420) {
-+        srcPtr = src + ((5 * srcHeight * srcPitch) / 4) //Start of V Plane
-+            + (srcX >> 1)                               //X Offset
-+            + ((srcY * srcPitch) >> 2);                 //Y Offset
-+    } else {
-+        srcPtr = src + (srcHeight * srcPitch) //Start of V Plane
-+            + (srcX >> 1)                     //X Offset
-+            + ((srcY * srcPitch) >> 2);       //Y Offset
-+    }
-+    for (i = 0; i < (h >> 1); i++) {
-+        memcpy(dstPtr, srcPtr, w >> 1);  //V Plane scanline
-+        srcPtr += srcPitch >> 1;
-+        dstPtr += dstPitch >> 1;
-+    }
-+}
-+
-+static void W100HostPackedData(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+    KdOffscreenArea *dst = port->src.surface;
-+    CARD8 *src = port->src.buffer;
-+    CARD16 srcPitch = port->src.width << 1; //WARN: padding?
-+    CARD16 dstPitch = (port->src.box.x2 - port->src.box.x1 + 1) << 1;
-+    CARD16 srcX = port->src.box.x1;
-+    CARD16 srcY = port->src.box.y1;
-+    CARD16 dstX = 0;
-+    CARD16 dstY = 0;
-+    CARD16 w = port->src.box.x2 - port->src.box.x1 + 1;
-+    CARD16 h = port->src.box.y2 - port->src.box.y1 + 1;
-+ 
-+    CARD8 *dstBase = dst->vidmem->base + dst->offset;
-+    CARD8 *dstPtr = dstBase + (dstY * dstPitch) + (dstX << 1);
-+    CARD8 *srcPtr = src + (srcY + srcPitch) + (srcX << 1);
-+
-+    DBG_IMAGEON(("W100HostPackedData(src(pitch:%d,offset:0x%08x,x:%d,y:%d),"
-+                 "dst(pitch:%d,offset:0x%08x,x:%d,y:%d), w:%d,h:%d)\n",
-+                 srcPitch, srcPtr, srcX, srcY,
-+                 dstPitch, dstPtr, dstX, dstY,
-+                 w, h));
-+    while (h--) {
-+        memcpy(dstPtr, srcPtr, (w << 1)); /* 16bpp assumed */
-+        srcPtr += srcPitch;
-+        dstPtr += dstPitch;
-+    }
-+}
-+                               
-+                               
-+static void W100StopVideo(KdScreenInfo *screen, pointer data, Bool exit)
-+{
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = (W100PortPrivPtr)data;
-+
-+    DBG_IMAGEON(("W100StopVideo(exit:%d)\n", exit));
-+
-+    REGION_EMPTY(screen->pScreen, &port->clip);
-+    
-+    if (exit) {
-+        if (port->videoStatus & W100_OVERLAY_ON) {
-+            W100OverlayDisable(screen);
-+        }
-+        if (port->src.surface) {
-+            KdOffscreenFree(screen->pScreen, port->src.surface);
-+            port->src.surface = NULL;
-+        }
-+
-+        if (port->ovl.surface) {
-+            KdOffscreenFree(screen->pScreen, port->ovl.surface);
-+            port->ovl.surface = NULL;
-+        }
-+        port->src.id = -1; // Just to avoid cached values.
-+    } else {
-+        if (port->videoStatus & W100_OVERLAY_ON) {
-+            W100OverlayDisable(screen);
-+        }
-+    }
-+}
-+
-+static int W100SetPortAttribute(KdScreenInfo *screen, 
-+                                Atom attribute, 
-+                                int value, 
-+                                pointer data)
-+{
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = (W100PortPrivPtr)data;
-+
-+    if (attribute == xvBrightness) {
-+        DBG_IMAGEON(("Setting Brightness attribute to %d\n", value));
-+        W100SetBrightness(w100c, value);
-+        port->ovl.brightness = value;
-+    } else if (attribute == xvMaxOverlaySize) {
-+        DBG_IMAGEON(("Setting MaxOverlaySize to %d\n", value));
-+        port->ovl.maxSize = value;
-+    } else if (attribute == xvColorKey) {
-+        DBG_IMAGEON(("Setting ColorKey attribute to %d\n", value));
-+        port->ovl.colorKey = value;
-+    }
-+    return Success;
-+}
-+
-+static int W100GetPortAttribute(KdScreenInfo *screen, 
-+                                Atom attribute,
-+                                int *value, 
-+                                pointer data)
-+{
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = (W100PortPrivPtr)data;
-+
-+    if (attribute == xvBrightness) {
-+        DBG_IMAGEON(("Getting Brightness attribute\n"));
-+        *value = port->ovl.brightness;
-+    } else if (attribute == xvMaxOverlaySize) {
-+        *value = port->ovl.maxSize;
-+        DBG_IMAGEON(("Getting Contrast attribute\n"));
-+    } else if (attribute == xvColorKey) {
-+        DBG_IMAGEON(("Getting ColorKey attribute\n"));
-+        *value = port->ovl.colorKey;
-+    }
-+    return Success;
-+}
-+
-+static void W100QueryBestSize(KdScreenInfo *screen,
-+                              Bool motion,
-+                              short vid_w, short vid_h, /*Video dimensions */
-+                              short drw_w, short drw_h, /*Drawable dimensions */
-+                              unsigned int *p_w, 
-+                              unsigned int *p_h,
-+                              pointer data)
-+{
-+    DBG_IMAGEON(("W100QueryBestSize(vid_w:%d,vid_h:%d,drw_w:%d,drw_h:%d)\n",
-+                 vid_w, vid_h, drw_w, drw_h));
-+    int xscaler = W100GetScaler(drw_w, vid_w);
-+    int yscaler = W100GetScaler(drw_h, vid_h);
-+    *p_w = W100ApplyScaler(vid_w, xscaler);
-+    *p_h = W100ApplyScaler(vid_h, yscaler);
-+}
-+
-+static int W100QueryImageAttributes(KdScreenInfo *screen, 
-+                                    int id, 
-+                                    unsigned short *w, unsigned short *h, 
-+                                    int *pitches, int *offsets)
-+{
-+    int size, tmp;
-+
-+    DBG_IMAGEON(("W100QueryImageAttributes(id:%d,w:%d,h:%d)\n", id, *w, *h));
-+
-+    if (*w > IMAGE_MAX_WIDTH) {
-+        *w = IMAGE_MAX_WIDTH;
-+    }
-+    if (*h > IMAGE_MAX_HEIGHT) {
-+        *h = IMAGE_MAX_HEIGHT;
-+    }
-+
-+    if (W_ALIGN) {
-+        *w = (*w + (W_ALIGN - 1)) & ~(W_ALIGN - 1);
-+    }
-+    if (H_ALIGN) {
-+        *h = (*h + (H_ALIGN - 1)) & ~(H_ALIGN - 1);
-+    }
-+    
-+    if (offsets) {
-+        offsets[0] = 0;
-+    }
-+
-+    switch (id) {
-+        /* Planar formats */
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+	*h = (*h + 1) & ~1;
-+	size = (*w + 3) & ~3;
-+	if (pitches) pitches[0] = size;
-+	size *= *h;
-+	if (offsets) offsets[1] = size;
-+	tmp = ((*w >> 1) + 3) & ~3;
-+	if (pitches) pitches[1] = pitches[2] = tmp;
-+	tmp *= (*h >> 1); 
-+	size += tmp; 
-+	if (offsets) offsets[2] = size;
-+	size += tmp;
-+	break;
-+        /* Packed Formats */
-+    case FOURCC_UYVY:
-+    case FOURCC_YUY2:
-+    default:
-+	size = *w << 1;
-+	if (pitches) pitches[0] = size;
-+	size *= *h;
-+	break;
-+    }
-+    return size;
-+}
-+
-+static void W100ClipVideo(BoxPtr src, BoxPtr dst, BoxPtr extents,
-+                          short width, short height)
-+{
-+    INT32 vscale, hscale, delta;
-+    INT32 diff, x1, x2, y1, y2;
-+
-+    hscale = ((src->x2 - src->x1) << 16) / (dst->x2 - dst->x1);
-+    vscale = ((src->y2 - src->y1) << 16) / (dst->y2 - dst->y1);
-+
-+    x1 = src->x1 << 16;
-+    x2 = src->x2 << 16;
-+    y1 = src->y1 << 16;
-+    y2 = src->y2 << 16;
-+
-+    diff = extents->x1 - dst->x1;
-+    if (diff > 0) {
-+        dst->x1 = extents->x1;
-+        x1 += diff * hscale;
-+    }
-+
-+    diff = dst->x2 - extents->x2;
-+    if (diff > 0) {
-+        dst->x2 = extents->x2;
-+        x2 -= diff * hscale;
-+    }
-+
-+    diff = extents->y1 - dst->y1;
-+    if (diff > 0) {
-+        dst->y1 = extents->y1;
-+        y1 += diff * vscale;
-+    }
-+
-+    diff = dst->y2 - extents->y2;
-+    if (diff > 0) {
-+        dst->y2 = extents->y2;
-+        y2 -= diff * vscale;
-+    }
-+
-+    if (x1 < 0) {
-+        diff = (- x1 + hscale - 1) / hscale;
-+        dst->x1 += diff;
-+        x1 += diff * hscale;
-+    }
-+
-+    delta = x2 - (width << 16);
-+    if (delta > 0) {
-+        diff = (delta + hscale - 1) / hscale;
-+        dst->x2 -= diff;
-+        x2 -= diff * hscale;
-+    }
-+
-+    if (y1 < 0) {
-+        diff = (- y1 + vscale - 1) / vscale;
-+        dst->y1 += diff;
-+        y1 += diff * vscale;
-+    }
-+    delta = y2 - (height << 16);
-+    if (delta > 0) {
-+        diff = (delta + vscale - 1) / vscale;
-+        dst->y2 -= diff;
-+        y2 -= diff * vscale;
-+    }
-+  
-+    src->x1 = x1 >> 16;
-+    src->x2 = x2 >> 16;
-+    src->y1 = y1 >> 16;
-+    src->y2 = y2 >> 16;
-+}
-+
-+static Bool W100SetOverlaySource(W100PortPrivPtr port,
-+                                 unsigned char *buffer,
-+                                 int id,
-+                                 short src_x, short src_y,
-+                                 short src_w, short src_h,
-+                                 short width, short height,
-+                                 short drw_x, short drw_y, 
-+                                 short drw_w, short drw_h,
-+                                 RegionPtr clipBoxes)
-+{
-+    
-+    BoxRec srcBox, dstBox;
-+    Bool changed = FALSE;
-+
-+    srcBox.x1 = src_x;
-+    srcBox.x2 = src_x + src_w - 1;
-+    srcBox.y1 = src_y;
-+    srcBox.y2 = src_y + src_h - 1;
-+
-+    dstBox.x1 = drw_x;
-+    dstBox.x2 = drw_x + drw_w - 1;
-+    dstBox.y1 = drw_y;
-+    dstBox.y2 = drw_y + drw_h - 1;
-+
-+    W100ClipVideo(&srcBox, &dstBox,
-+                  REGION_EXTENTS(pScreen, clipBoxes),
-+                  width, height);
-+
-+    port->src.buffer = buffer;
-+    port->ovl.changed = FALSE;
-+
-+    if (port->src.id != id) {
-+        port->src.id = id;
-+        changed = TRUE;
-+        port->ovl.changed = TRUE;
-+    }
-+    if (port->src.box.x1 != srcBox.x1) {
-+        port->src.box.x1 = srcBox.x1;
-+        changed = TRUE;
-+    }
-+    if (port->src.box.x2 != srcBox.x2) {
-+        port->src.box.x2 = srcBox.x2;
-+        changed = TRUE;
-+    }
-+    if (port->src.box.y1 != srcBox.y1) {
-+        port->src.box.y1 = srcBox.y1;
-+        changed = TRUE;
-+    }
-+    if (port->src.box.y2 != srcBox.y2) {
-+        port->src.box.y2 = srcBox.y2;
-+        changed = TRUE;
-+    }
-+    if (port->src.width != width) {
-+        port->src.width = width;
-+        changed = TRUE;
-+    }
-+    if (port->src.height != height) {
-+        port->src.height = height;
-+        changed = TRUE;
-+    }
-+
-+    if (port->dst.box.x1 != dstBox.x1) {
-+        port->dst.box.x1 = dstBox.x1;
-+        changed = TRUE;
-+    }
-+    if (port->dst.box.x2 != dstBox.x2) {
-+        port->dst.box.x2 = dstBox.x2;
-+        changed = TRUE;
-+    }
-+    if (port->dst.box.y1 != dstBox.y1) {
-+        port->dst.box.y1 = dstBox.y1;
-+        changed = TRUE;
-+    }
-+    if (port->dst.box.y2 != dstBox.y2) {
-+        port->dst.box.y2 = dstBox.y2;
-+        changed = TRUE;
-+    }
-+
-+    if (changed) {
-+        port->src.size = W100SurfaceSize(port, 
-+                                         srcBox.x2 - srcBox.x1 + 1,
-+                                         srcBox.y2 - srcBox.y1 + 1);
-+    }
-+    port->changed = changed;
-+    return changed;
-+}
-+
-+
-+
-+static int W100SetOverlaySurfaces(KdScreenInfo *screen,
-+                                  short x, short y, short w, short h)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+
-+    if (port->ovl.changed ||
-+        (port->ovl.frame.x1 != x) ||
-+        (port->ovl.frame.y1 != y) ||
-+        (port->ovl.frame.x2 != (x + w - 1)) ||
-+        (port->ovl.frame.y2 != (y + h - 1))) {
-+
-+        port->ovl.changed = TRUE;
-+        port->ovl.frame.x1 = x;
-+        port->ovl.frame.x2 = x + w - 1;
-+        port->ovl.frame.y1 = y;
-+        port->ovl.frame.y2 = y + h - 1;
-+
-+        W100MapToDevice(w100c, &port->dst.box, &port->ovl.box);
-+        W100ChangeOrigin(&port->ovl.box,
-+                         port->ovl.frame.x1, port->ovl.frame.y1);
-+        port->ovl.box.x2 >>= port->ovl.horExp;
-+        port->ovl.box.y2 >>= port->ovl.verExp;
-+        DBG_IMAGEON(("Translated ovl.box(x1:%d,y1:%d,x2:%d,y2:%d)\n",
-+                     port->ovl.box.x1, port->ovl.box.y1,
-+                     port->ovl.box.x2, port->ovl.box.y2));
-+    }
-+    
-+    switch (port->src.id) {
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        port->planes.size = 3;
-+        port->planes.offset[0] = 0;
-+        port->planes.offset[1] = w * h;
-+        port->planes.offset[2] = (5 * (w * h)) / 4;
-+        port->planes.bpp = 8;
-+        break;
-+    case FOURCC_UYVY:
-+    case FOURCC_YUY2:
-+        port->planes.size = 1;
-+        port->planes.offset[0] = 0;
-+        port->planes.bpp = 16;
-+        break;
-+    }
-+
-+    if (port->ovl.surface && port->ovl.size != port->ovl.surface->size) {
-+        KdOffscreenFree(screen->pScreen, port->ovl.surface);
-+        KdOffscreenFree(screen->pScreen, port->src.surface);
-+        port->ovl.surface = NULL;
-+        port->src.surface = NULL;
-+    }
-+    if (port->src.surface && port->src.size != port->src.surface->size) {
-+        KdOffscreenFree(screen->pScreen, port->src.surface);
-+        port->src.surface = NULL;
-+    }
-+
-+    if (!port->ovl.surface) {
-+        port->ovl.surface = KdOffscreenAllocPrio(screen->pScreen,
-+                                                 port->ovl.size, 0, TRUE,
-+                                                 W100VideoSave,
-+                                                 port,
-+                                                 KD_VIDMEM_MAXPRIO,
-+                                                 KD_VIDMEM_MAXPRIO,
-+                                                 TRUE);
-+        if (!port->ovl.surface) {
-+            ErrorF("Using external memory for overlay surface. "
-+                   "Expect bad performance\n");
-+            port->ovl.surface = KdOffscreenAlloc(screen->pScreen,
-+                                                 port->ovl.size, 0, TRUE, 
-+                                                 W100VideoSave,
-+                                                 port);
-+        }
-+        if (!port->ovl.surface) {
-+            ErrorF("Unable to allocate %d bytes for overlay surface\n",
-+                   port->ovl.size);
-+            return BadAlloc;
-+        }
-+
-+        W100ClearSurface(screen, port->ovl.surface,
-+                         0, 0, 
-+                         (w * port->planes.bpp / 8),
-+                         w, h, port->src.id);
-+    }
-+    if (!port->src.surface) {
-+        port->src.surface = KdOffscreenAlloc(screen->pScreen,
-+                                             port->src.size, 0, TRUE, 
-+                                             W100VideoSave,
-+                                             port);
-+        if (!port->src.surface) {
-+            ErrorF("Unable to allocate %d bytes for offscreen surface\n",
-+                   port->src.size);
-+            return BadAlloc;
-+        }
-+    }
-+
-+    CARD32 baseAddr = (CARD32) W100_HOST2CARD(port->ovl.surface->vidmem->base +
-+                                              port->ovl.surface->offset);
-+
-+
-+    switch (port->src.id) {
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        port->planes.yplane = baseAddr + port->planes.offset[0];
-+        port->planes.uplane = baseAddr + port->planes.offset[1];
-+        port->planes.vplane = baseAddr + port->planes.offset[2];
-+        break;
-+    case FOURCC_UYVY:
-+    case FOURCC_YUY2:
-+        port->planes.yplane = baseAddr + port->planes.offset[0];
-+        port->planes.uplane = 0;
-+        port->planes.vplane = 0;
-+        break;
-+    }
-+
-+    return Success;
-+}
-+                                   
-+static int W100OvlSetup(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+    BoxRec ovlBox;
-+    short x, y, w, h;
-+    int i;
-+
-+    W100MapToDevice(w100c, &port->dst.box, &ovlBox);
-+
-+    x = ovlBox.x1 & ~7;
-+    y = ovlBox.y1;
-+
-+    for (i = 0; i < NUM_OVL_RESIZERS; i++) {
-+        w = (ovlBox.x2 - x + 1) >> ovlResizers[i].xfactor;
-+        h = (ovlBox.y2 - y + 1) >> ovlResizers[i].yfactor;
-+        w = W100_ALIGN(w, OVL_W_ALIGN);
-+        h = W100_ALIGN(h, OVL_H_ALIGN);
-+        port->ovl.size = W100SurfaceSize(port, w, h);
-+        DBG_IMAGEON(("Trying overlay surface (x:%d,y:%d,w:%d,h:%d). Size %d."
-+                     " xfactor:%d, yfactor:%d\n",
-+                     x, y, w, h, port->ovl.size,
-+                     ovlResizers[i].xfactor,
-+                     ovlResizers[i].yfactor));
-+        if (port->ovl.size <= port->ovl.maxSize) {
-+            ErrorF("Using (x=%d,y=%d,w=%d,h=%d) overlay surface (%d bytes). "
-+                   "Resizer(xfactor:%d,yfactor:%d)\n",
-+                   x, y, w, h, port->ovl.size,
-+                   ovlResizers[i].xfactor, ovlResizers[i].yfactor);
-+            port->ovl.horExp = ovlResizers[i].xfactor;
-+            port->ovl.verExp = ovlResizers[i].yfactor;
-+            return W100SetOverlaySurfaces(screen, x, y, w, h);
-+        }
-+    }
-+    return BadAlloc;
-+}
-+    
-+static void W100OvlHostData(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+
-+    W100WaitIdle(w100c);
-+    switch (port->src.id) {
-+    case FOURCC_YV12:
-+    case FOURCC_I420:
-+        W100HostPlanarData(screen);
-+        break;
-+    case FOURCC_UYVY:
-+    case FOURCC_YUY2:
-+        W100HostPackedData(screen);
-+        break;
-+    }
-+}
-+
-+static void W100OvlBlt(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100CardInfo(screen);
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+    static int frame = 0;
-+    int srcW = port->src.box.x2 - port->src.box.x1 + 1;
-+    int srcH = port->src.box.y2 - port->src.box.y1 + 1;
-+    int dstW = port->ovl.frame.x2 - port->ovl.frame.x1 + 1;
-+    int dstH = port->ovl.frame.y2 - port->ovl.frame.y1 + 1;
-+
-+    DBG_IMAGEON(("ovl.box(x1:%d,y1:%d,x2:%d,y2:%d),"
-+                 "src.box(x1:%d,y1:%d,x2:%d,y2:%d),"
-+                 "dstW:%d, dstH:%d\n",
-+                 port->ovl.box.x1, port->ovl.box.y1,
-+                 port->ovl.box.x2, port->ovl.box.y2,
-+                 port->src.box.x1, port->src.box.y1,
-+                 port->src.box.x2, port->src.box.y2,
-+                 dstW, dstH));
-+
-+    W100PlanarBlt(screen,                        //KdScreenInfo* screen
-+                  port->planes.size,             //int planes
-+                  port->planes.offset,           //int planeOffsets[]
-+                  port->planes.bpp,              //int bpp
-+                  w100c->hw_window.randr,        //int randr
-+                  port->src.surface,             //KdOffscrenArea *src
-+                  srcW,                          //int srcW
-+                  srcH,                          //int srcH
-+                  &port->src.box,                //BoxPtr srcBox
-+                  port->ovl.surface,             //KdOffscreenArea *dst
-+                  dstW,                          //int dstW
-+                  dstH,                          //int dstH
-+                  &port->ovl.box);               //BoxPtr dstBox
-+
-+#if 0
-+    if (++frame == 10) {
-+    W100SaveSurface(port->src.surface->vidmem->base +
-+                    port->src.surface->offset, 
-+                    port->src.surface->size, 
-+                    "/media/card/kdrive/source.yuv");
-+    W100SaveSurface(port->ovl.surface->vidmem->base +
-+                    port->ovl.surface->offset, 
-+                    port->ovl.surface->size, 
-+                    "/media/card/kdrive/ovl.yuv");
-+    exit(1);
-+    }
-+#endif
-+}
-+
-+static void W100OvlUpdate(KdScreenInfo *screen)
-+{
-+    W100ScreenInfo *w100s = screen->driver;
-+    W100PortPrivPtr port = w100s->pAdaptor->pPortPrivates[0].ptr;
-+
-+    if (port->videoStatus & W100_OVERLAY_ON) {
-+        W100OverlayDisable(screen);
-+    }
-+    port->videoStatus &= ~W100_OVERLAY_CONFIGURED;
-+
-+    W100OverlayEnable(screen);
-+}
-+
-+static int W100PutImage(KdScreenInfo *screen, 
-+                        DrawablePtr pDraw,        /* Destination drawable */
-+                        short src_x, short src_y, /* Source coordinates   */
-+                        short drw_x, short drw_y, /* Destination coordinates */
-+                        short src_w, short src_h, /* Source rectangle to put */
-+                        short drw_w, short drw_h, /* Destination size */
-+                        int id,                   /* FOURCC id        */
-+                        unsigned char *buffer,    /* Source data      */
-+                        short width,              /* Source width     */
-+                        short height,             /* Source height    */
-+                        Bool sync,                /* Sync before returning */
-+                        RegionPtr clipBoxes,
-+                        pointer data)
-+{
-+    ScreenPtr pScreen = screen->pScreen;
-+    KdScreenPriv(pScreen);
-+    W100CardInfo(pScreenPriv);
-+    W100ScreenInfo(pScreenPriv);
-+    W100PortPrivPtr port = (W100PortPrivPtr) data;
-+    int errCode;
-+
-+    DBG_IMAGEON(("W100PutImage(src(x:%d,y:%d,w:%d,h:%d),"
-+                 "drw(x:%d,y:%d,w:%d,h:%d),"
-+                 "width:%d,height:%d), buffer:%p)\n",
-+                 src_x,src_y,src_w,src_h,
-+                 drw_x,drw_y,drw_w,drw_h,
-+                 width, height,
-+                 buffer));
-+
-+    if (W100SetOverlaySource(port, buffer, id, 
-+                             src_x, src_y, src_w, src_h, 
-+                             width, height,
-+                             drw_x, drw_y, drw_w, drw_h, 
-+                             clipBoxes)) {
-+        if ((errCode = W100OvlSetup(screen)) != Success) {
-+            return errCode;
-+        }
-+    }
-+    W100OvlHostData(screen);
-+    /* Update cliplist */
-+    if(!REGION_EQUAL(screen->pScreen, &port->clip, clipBoxes)) {
-+	REGION_COPY(screen->pScreen, &port->clip, clipBoxes);
-+	KXVPaintRegion(pDraw, &port->clip, port->ovl.colorKey);
-+    }
-+    
-+    W100OvlBlt(screen);
-+
-+    if (port->ovl.changed) {
-+        W100OvlUpdate(screen);
-+    }
-+    return Success;
-+}
-+    
-+static KdVideoAdaptorPtr 
-+W100SetupImageVideo(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100CardInfo(pScreenPriv);
-+    KdVideoAdaptorPtr adaptor;
-+    W100PortPrivPtr port;
-+
-+    adaptor = xcalloc(1, sizeof(KdVideoAdaptorRec) 
-+                      +  sizeof(W100PortPrivRec) 
-+                      +  sizeof(DevUnion));
-+    if (adaptor == NULL) {
-+        return NULL;
-+    }
-+
-+    adaptor->type = XvWindowMask | XvInputMask | XvImageMask;
-+    adaptor->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
-+    adaptor->name = "ATI (C) Imageon Video Overlay";
-+    adaptor->nEncodings = 1;
-+    adaptor->pEncodings = DummyEncoding;
-+    adaptor->nFormats = NUM_FORMATS;
-+    adaptor->pFormats = Formats;
-+    adaptor->nPorts = 1;
-+    adaptor->pPortPrivates = (DevUnion*)(&adaptor[1]);
-+
-+    port = (W100PortPrivPtr)(&adaptor->pPortPrivates[1]);
-+
-+    adaptor->pPortPrivates[0].ptr = (pointer)(port);
-+
-+    adaptor->nAttributes = NUM_ATTRIBUTES;
-+    adaptor->pAttributes = Attributes;
-+    adaptor->pImages = Images;
-+    adaptor->nImages = NUM_IMAGES;
-+    adaptor->PutVideo = NULL;
-+    adaptor->PutStill = NULL;
-+    adaptor->GetVideo = NULL;
-+    adaptor->GetStill = NULL;
-+    adaptor->StopVideo = W100StopVideo;
-+    adaptor->SetPortAttribute = W100SetPortAttribute;
-+    adaptor->GetPortAttribute = W100GetPortAttribute;
-+    adaptor->QueryBestSize = W100QueryBestSize;
-+    adaptor->PutImage = W100PutImage;
-+    adaptor->ReputImage = NULL;
-+    adaptor->QueryImageAttributes = W100QueryImageAttributes;
-+
-+    REGION_INIT(pScreen, &port->clip, NullBox, 0);
-+
-+    w100s->pAdaptor = adaptor;
-+
-+    xvBrightness     = MAKE_ATOM("XV_BRIGHTNESS");
-+    xvColorKey       = MAKE_ATOM("XV_COLORKEY");
-+    xvMaxOverlaySize = MAKE_ATOM("XV_MAXOVERLAYSIZE");
-+
-+    port->ovl.maxSize = OVL_MAX_SIZE;
-+    port->ovl.colorKey = 0xff00;
-+    port->ovl.brightness = W100GetBrightness(w100c);
-+    return adaptor;
-+}
-+
-+Bool W100InitVideo(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    W100CardInfo(pScreenPriv);
-+    KdScreenInfo *screen = pScreenPriv->screen;
-+    KdVideoAdaptorPtr *adaptors, *newAdaptors = NULL;
-+    KdVideoAdaptorPtr newAdaptor = NULL;
-+    int num_adaptors;
-+    
-+    w100s->pAdaptor = NULL;
-+
-+    if (w100c->reg_base == NULL)
-+        return FALSE;
-+
-+    num_adaptors = KdXVListGenericAdaptors(screen, &adaptors);
-+
-+    newAdaptor = W100SetupImageVideo(pScreen);
-+
-+    if (newAdaptor) {
-+        if (!num_adaptors) {
-+            num_adaptors = 1;
-+            adaptors = &newAdaptor;
-+        } else {
-+            newAdaptors = xalloc((num_adaptors + 1) * 
-+                                 sizeof(KdVideoAdaptorPtr *));
-+            if (newAdaptors) {
-+                memcpy(newAdaptors, adaptors, num_adaptors *
-+                       sizeof(KdVideoAdaptorPtr));
-+                newAdaptors[num_adaptors] = newAdaptor;
-+                adaptors = newAdaptors;
-+                num_adaptors++;
-+            }
-+        }
-+    }
-+
-+    if (num_adaptors)
-+        KdXVScreenInit(pScreen, adaptors, num_adaptors);
-+
-+    if (newAdaptors)
-+        xfree(newAdaptors);
-+    
-+    return TRUE;
-+}
-+
-+void
-+W100FiniVideo(ScreenPtr pScreen)
-+{
-+    KdScreenPriv(pScreen);
-+    W100ScreenInfo(pScreenPriv);
-+    KdVideoAdaptorPtr adaptor = w100s->pAdaptor;
-+    W100PortPrivPtr port;
-+    int i;
-+
-+    if (!adaptor)
-+        return;
-+
-+    port = (W100PortPrivPtr)(&adaptor->pPortPrivates[0].ptr);
-+    REGION_UNINIT(pScreen, &port->clip);
-+
-+    xfree(adaptor);
-+    w100s->pAdaptor = NULL;
-+}
-+
-Index: xorg-server-1.2.0/hw/kdrive/imageon/imageon_support.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xorg-server-1.2.0/hw/kdrive/imageon/imageon_support.h	2007-06-17 10:49:02.000000000 +0200
-@@ -0,0 +1,108 @@
-+/*
-+ * Copyright © 2007 Manuel Teira
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Manuel Teira not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission.  Manuel Teira makes no
-+ * representations about the suitability of this software for any purpose.  It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MANUEL TEIRA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL MANUEL TEIRA BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef _IMAGEON_SUPPORT_H_
-+#define _IMAGEON_SUPPORT_H
-+
-+#include "imageon.h"
-+
-+extern CARD8 W100SolidRop[16];
-+extern CARD8 W100BltRop[16];
-+
-+/* Card control */
-+void W100DisableDisplayUpdate(W100CardInfo *w100c);
-+void W100EnableDisplayUpdate(W100CardInfo *w100c);
-+void W100SetupGraphicEngine(W100CardInfo *w100c);
-+void W100ResetGraphicEngine(W100CardInfo *w100c);
-+void W100SetupGraphicWindow(W100CardInfo *w100c);
-+void W100EnableGraphicWindow(W100CardInfo *w100c);
-+void W100DisableGraphicWindow(W100CardInfo *w100c);
-+void W100VSync(W100CardInfo *w100c);
-+
-+/* Wait for card slots */
-+__inline__ Bool W100WaitCmdFifoEntries(W100CardInfo *w100c, int entries);
-+Bool W100WaitIdle(W100CardInfo *w100c);
-+
-+/* Set context of the current operation */
-+void W100ResetContext(W100CardInfo *w100c);
-+CARD32 W100ComputeSolidGmc(W100CardInfo *w100c, CARD8 alu);
-+CARD32 W100ComputeCopyGmc(W100CardInfo *w100c, CARD8 alu);
-+CARD32 W100ComputeAritGmc(W100CardInfo *w100c, CARD8 alu);
-+void W100SetXForm(W100CardInfo *w100c, int dx, int dy);
-+void W100SetRotation(W100CardInfo *w100c, int randr, Bool mirror);
-+void W100SetPixelMask(W100CardInfo *w100c, Pixel mask);
-+Bool W100SetSource(KdScreenInfo *screen, CARD32 srcPitch, 
-+                   CARD32 srcOffset, CARD8 bpp);
-+Bool W100SetDestination(KdScreenInfo *screen, CARD32 dstPitch, 
-+                        CARD32 dstOffset, CARD8 bpp);
-+Bool W100SetSourcePixmap(PixmapPtr pPix);
-+Bool W100SetDestinationPixmap(PixmapPtr pPix);
-+
-+/* Scaler related functions */
-+CARD8 W100GetScaler(CARD16 dstsize, CARD16 srcsize);
-+CARD16 W100ApplyScaler(CARD16 srcsize, CARD8 scaler);
-+
-+/* Blitting functions */
-+void W100PlanarBlt(KdScreenInfo *screen, int planes, int planeOffsets[],
-+                   int bpp, int randr,
-+                   KdOffscreenArea *src, int srcW, int srcH, BoxPtr srcBox,
-+                   KdOffscreenArea *dst, int dstW, int dstH, BoxPtr dstBox);
-+static void W100ScaledBlt(KdScreenInfo *screen, int randr, int bpp,
-+                          CARD32 srcOffset, CARD16 srcPitch, BoxPtr srcBox,
-+                          CARD32 dstOffset, CARD16 dstPitch, BoxPtr dstBox,
-+                          CARD8 xscaler, CARD8 yscaler);
-+static void W100StretchBlt(KdScreenInfo *screen, int randr, int bpp,
-+                          CARD32 srcOffset, CARD16 srcPitch, BoxPtr srcBox,
-+                          CARD32 dstOffset, CARD16 dstPitch, BoxPtr dstBox,
-+                          CARD8 xscaler, CARD8 yscaler);
-+static void W100Blt(KdScreenInfo *screen, int randr, int bpp,
-+                    CARD32 srcOffset, CARD16 srcPitch, BoxPtr srcBox,
-+                    CARD32 dstOffset, CARD16 dstPitch, BoxPtr dstBox);
-+
-+/* Brightness functions */
-+CARD8 W100GetBrightness(W100CardInfo *w100c);
-+void W100SetBrightness(W100CardInfo *w100c, CARD8 value);
-+
-+
-+/* Get and set mode and rotation info */
-+int W100GetRotation(W100CardInfo *w100c);
-+W100ModeSpec *W100GetModeSpec(W100CardInfo *w100c, W100Mode *mode);
-+Bool W100GetFbMode(W100CardInfo *w100c, W100Mode *mode);
-+Bool W100CheckFbMode(W100CardInfo *w100c, W100ModeSpec *modes);
-+W100ModeSpec *W100GetBestMode(W100CardInfo *w100c, int width, int height);
-+
-+/* SysFS helpers */
-+Bool W100SysFsGet(W100CardInfo *w100c, const char *path, char *value);
-+Bool W100SysFsSet(W100CardInfo *w100c, const char *path, const char *value);
-+
-+/* Coordinate transformations */
-+void W100TransformTsLibCoordinates(long *x, long *y, void *closure);
-+void W100MapToDevice(W100CardInfo *w100c, BoxPtr src, BoxPtr dst);
-+void W100MapFromDevice(W100CardInfo *w100c, BoxPtr src, BoxPtr dst);
-+void W100ChangeOrigin(BoxPtr src, int x, int y);
-+void W100TrajectoryOrigin(W100CardInfo *w100c, BoxPtr box, short *x, short *y);
-+void W100ScaleBox(BoxPtr src, BoxPtr dst, int scale);
-+void W100MoveTo(BoxPtr src, int x, int y);
-+
-+
-+
-+#endif
-Index: xorg-server-1.2.0/hw/kdrive/linux/tslib.c
-===================================================================
---- xorg-server-1.2.0.orig/hw/kdrive/linux/tslib.c	2007-01-23 06:39:15.000000000 +0100
-+++ xorg-server-1.2.0/hw/kdrive/linux/tslib.c	2007-06-17 10:49:02.000000000 +0200
-@@ -92,6 +92,10 @@
- void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
- void *tslib_raw_event_closure;
- 
-+/* To support randr hot resolution change */
-+void (*tslib_transform_coords)(long *x, long *y, void *closure);
-+void *tslib_transform_closure;
-+
- int TsInputType = 0;
- int KdTsPhyScreen = 0; 		/* XXX Togo .. */
- 
-@@ -121,7 +125,9 @@
- 	flags = (event.pressure) ? KD_BUTTON_1 : 0;
- 	x = event.x;
- 	y = event.y;
--	
-+	if (tslib_transform_coords) {
-+		tslib_transform_coords(&x, &y, tslib_transform_closure);
-+	}
- 	KdEnqueueMouseEvent (mi, flags, x, y);
-       }
- }
diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 8ed650266b..26f8666076 100644
--- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate"
 PROVIDES = "virtual/xserver"
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -20,6 +20,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://kdrive-vidmemarea.patch;patch=1 \
         file://kdrive-imageon.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1 \
+        file://enable-builtin-fonts.patch;patch=1 \
         "
        
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
index cd58624ce0..85ca58439a 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -15,17 +15,9 @@ fi
 if [ -f /usr/bin/Xomap ]; then
   XSERVER=/usr/bin/Xomap
 fi
-if [ -f /usr/bin/Xw100 ]; then
-  XSERVER=Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
-   XSERVER=Ximageon
-fi
 
 . /etc/profile
 
-
-
 fallback_screen_arg() {
     geom=`fbset | grep geometry`
     w=`echo $geom | awk '{ print $2 }'`
@@ -66,7 +58,9 @@ case `module_id` in
         "HP iPAQ H5400" | "HP iPAQ H2200")
                 ARGS="$ARGS -dpi 100 -rgba rgb" ;;
         "HP iPAQ HX4700")
-                ARGS="$ARGS -dpi 200" ;;
+                ARGS="$ARGS -dpi 200"
+                IMAGEON="w3220"
+                ;;
         "Ramses")
                 # What is this "vt2" in aid of?
                 ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
@@ -76,7 +70,9 @@ case `module_id` in
         *Collie)
                 ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;;
         "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-                ARGS="$ARGS -dpi 200 -rgba rgb" ;;
+                ARGS="$ARGS -dpi 200 -rgba rgb"
+                IMAGEON="w100"
+                ;;
         "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
                 ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640@270" ;;
         "Simpad")
@@ -93,21 +89,30 @@ case `module_id` in
                 ARGS="$ARGS -rgba vrgb" ;;
         "Compulab CM-x270")
                 modprobe mbxfb
-	            ARGS="$ARGS -fb /dev/fb1" ;;
+                ARGS="$ARGS -fb /dev/fb1" ;;
         "GTA01" | "GTA02")
                 ARGS="$ARGS -dpi 285 -screen 480x640" ;;
         "Nokia N800")
                 ARGS="$ARGS -dpi 225 -screen 800x480x16 -mouse tslib" ;;
         "Motorola Ezx Platform")
                 ARGS="$ARGS -dpi 170 -screen 240x320" ;;
-	*)
-		# It is a device we do not know about, in which case we force
-        # kdrive to use the current framebuffer geometry -- otherwise
-		# it will default to trying to achieve 1024x768
-		S=`fallback_screen_arg`
-		ARGS="$ARGS -screen $S" ;;
+        *)
+                # It is a device we do not know about, in which case we force
+                # kdrive to use the current framebuffer geometry -- otherwise
+                # it will default to trying to achieve 1024x768
+                S=`fallback_screen_arg`
+                ARGS="$ARGS -screen $S" ;;
 esac
 
+if [ ! -z "$IMAGEON" ]; then
+  if [ -f /usr/bin/Xw100 ]; then
+    XSERVER=/usr/bin/Xw100
+  fi
+  if [ -f /usr/bin/Ximageon ]; then
+    XSERVER=/usr/bin/Ximageon
+  fi
+fi
+
 DISPLAY=':0'
 
 exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
index 7c8e6d3365..489010a414 100644
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
+++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -15,12 +15,6 @@ fi
 if [ -f /usr/bin/Xomap ]; then
   XSERVER=/usr/bin/Xomap
 fi
-if [ -f /usr/bin/Xw100 ]; then
-  XSERVER=Xw100
-fi
-if [ -f /usr/bin/Ximageon ]; then
-   XSERVER=Ximageon
-fi
 
 . /etc/profile
 
@@ -64,7 +58,9 @@ case `module_id` in
         "HP iPAQ H5400" | "HP iPAQ H2200")
                 ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
         "HP iPAQ HX4700")
-                ARGS="$ARGS -br -dpi 200" ;;
+                ARGS="$ARGS -br -dpi 200"
+                IMAGEON="w3220"
+                ;;
         "Ramses")
                 # What is this "vt2" in aid of?
                 ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90 vt2" ;;
@@ -72,10 +68,11 @@ case `module_id` in
         *Poodle)
                 ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;;
         *Collie)
-                ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270"
-                ;;
+                ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;;
         "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-                ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
+                ARGS="$ARGS -br -dpi 200 -rgba rgb"
+                IMAGEON="w100"
+                ;;
         "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
                 ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640@270" ;;
         "Simpad")
@@ -89,7 +86,7 @@ case `module_id` in
         "HTC Universal")
                 ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;;
         "ARM-IntegratorCP" | "ARM-Versatile PB")
-		        ARGS="$ARGS -br -rgba vrgb" ;;
+                ARGS="$ARGS -br -rgba vrgb" ;;
         "Compulab CM-x270")
                 modprobe mbxfb
                 ARGS="$ARGS -br -fb /dev/fb1" ;;
@@ -100,13 +97,22 @@ case `module_id` in
         "Nokia N800")
                 ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
         *)
-		        # It is a device we do not know about, in which case we force
+                # It is a device we do not know about, in which case we force
                 # kdrive to use the current framebuffer geometry -- otherwise
-		        # it will default to trying to achieve 1024x768
-		        S=`fallback_screen_arg`
-		        ARGS="$ARGS -screen $S" ;;
+                # it will default to trying to achieve 1024x768
+                S=`fallback_screen_arg`
+                ARGS="$ARGS -screen $S" ;;
 esac
 
+if [ ! -z "$IMAGEON" ]; then
+  if [ -f /usr/bin/Xw100 ]; then
+    XSERVER=/usr/bin/Xw100
+  fi
+  if [ -f /usr/bin/Ximageon ]; then
+    XSERVER=/usr/bin/Ximageon
+  fi
+fi
+
 DISPLAY=':0'
 
 exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
diff --git a/site/arm-common b/site/arm-common
index bfc141072b..fb050dbcf1 100644
--- a/site/arm-common
+++ b/site/arm-common
@@ -158,15 +158,15 @@ nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 # ORBit2
 ac_cv_alignof_CORBA_boolean=1
 ac_cv_alignof_CORBA_char=1
-ac_cv_alignof_CORBA_double=4
+ac_cv_alignof_CORBA_double=8
 ac_cv_alignof_CORBA_float=4
 ac_cv_alignof_CORBA_long=4
-ac_cv_alignof_CORBA_long_double=4
-ac_cv_alignof_CORBA_long_long=4
+ac_cv_alignof_CORBA_long_double=8
+ac_cv_alignof_CORBA_long_long=8
 ac_cv_alignof_CORBA_octet=1
 ac_cv_alignof_CORBA_pointer=4
 ac_cv_alignof_CORBA_short=2
-ac_cv_alignof_CORBA_struct=4
+ac_cv_alignof_CORBA_struct=1
 ac_cv_alignof_CORBA_wchar=2
 ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
 
diff --git a/site/arm-linux b/site/arm-linux
index d45c8f87c2..9aea75b5a9 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -168,6 +168,9 @@ ac_cv_file___dev_ptc_=yes
 #mono
 mono_cv_uscore=${mono_cv_uscore=no}
 
+# guile
+ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes}
+
 # gnet
 ac_cv_member_struct_sockaddr_sa_len=${ac_cv_member_struct_sockaddr_sa_len=no}
 ac_cv_gnet_have_abstract_sockets=${ac_cv_gnet_have_abstract_sockets=no}
diff --git a/site/common-glibc b/site/common-glibc
index 8e0e90d614..edbf4b41ee 100644
--- a/site/common-glibc
+++ b/site/common-glibc
@@ -21,6 +21,9 @@ ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
 glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
 glib_cv_long_long_format=${glib_cv_long_long_format=ll}
 
+#dbus-glib
+ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
+
 # gnucash
 am_cv_scanf_lld=${am_cv_scanf_lld=yes}
 
diff --git a/site/common-uclibc b/site/common-uclibc
index a57abdbef8..3112d3ed6c 100644
--- a/site/common-uclibc
+++ b/site/common-uclibc
@@ -1,6 +1,9 @@
 # general
 ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no}
 
+#dbus-glib
+ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
+
 # bash
 bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=no}
 bash_cv_sys_siglist=${bash_cv_sys_siglist=no}
author	Leon Woestenberg <leon.woestenberg@gmail.com>	2007-10-05 12:43:03 +0000
committer	Leon Woestenberg <leon.woestenberg@gmail.com>	2007-10-05 12:43:03 +0000
commit	fb5a8ff3d88fca827e22ad48f136c7fe1c6cea10 (patch)
tree	f28b9b4a860576cf9909d567efc7baeb20dd2740
parent	f0f72d8aa5de6a41796117c6e781e150bbacbe47 (diff)
parent	bab0c48ac5132ad63b4f3da27a1c39c20b5db86c (diff)